| commit | a9e2014ea5bbbd291ab6634a497038d30df57d0a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 08 08:21:55 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 08 08:21:55 2012 -0700 |
| tree | 326b491d9abb46e24667839e0ab78277c47df1e3 | |
| parent | db156c71c69b348ad0a1d454d35a3dd936a29804 [diff] | |
| parent | 4924a1b027a1536c9dbd45497d54947f454f5232 [diff] |
am 4924a1b0: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '4924a1b027a1536c9dbd45497d54947f454f5232':