| commit | 3073ca01fc4bc470b019bee53f2786f5228ac2e9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 06:26:57 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 06:26:57 2012 -0800 |
| tree | bc24a92c6eb64b5e5d50bae12f79b59324733590 | |
| parent | 31a359d83c2bd46ef3831009a1796e1c76bfc256 [diff] | |
| parent | 9fa26b05c8980a4d069cab5100fa64e640b70f40 [diff] |
am 9fa26b05: am af0ae048: Reconcile with jb-mr1-release - do not merge * commit '9fa26b05c8980a4d069cab5100fa64e640b70f40':