| commit | 17c117f7a8f2ac0e790d6d6ff89976d55b4dece6 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Sep 26 10:07:54 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 26 10:07:54 2012 -0700 |
| tree | 876f9d92ac2170a7f7afd9d18861762bec6fa99b | |
| parent | 63e302a8c4f17582970433b316d5fec8da26a73c [diff] | |
| parent | 9fea43e972e992964313377c3392d6c0fd762a44 [diff] |
am 9fea43e9: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '9fea43e972e992964313377c3392d6c0fd762a44':