| commit | f39be6b58a30c2260fcaad9de0edd16a5720a41d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 05 08:20:48 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 05 08:20:48 2012 -0700 |
| tree | a64b057de7bc4a731fac895b5bf8f42fb91d9cd4 | |
| parent | 243ba6eed755085236493b75da7267eeaf1a1e1e [diff] | |
| parent | e21cbe0db2b3afa39be9f65ec0bc7aea7ed2d0dc [diff] |
am e21cbe0d: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'e21cbe0db2b3afa39be9f65ec0bc7aea7ed2d0dc':