| commit | 12406fc6c055ab623ba7e077185aa599b335c71d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 08:58:03 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 08:58:03 2012 -0800 |
| tree | a02e446d0b19fb3c9525d860bc6504030efdb4e0 | |
| parent | 59d471c8dea53871f867fc205aa276c0623bad9c [diff] | |
| parent | 48c04a2712167e07d12316b042695988d6eccaf3 [diff] |
am 48c04a27: Reconcile with jb-mr1-release - do not merge * commit '48c04a2712167e07d12316b042695988d6eccaf3':