| commit | 43107b3f948f69be2b77bd8f847b8cbf2ce513d5 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 01 07:53:07 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 01 07:53:07 2012 -0700 |
| tree | a103d286417d6b32d79a187890f278381cd63b3c | |
| parent | 9656286829b79664e6413373a3932ca99e1403c9 [diff] | |
| parent | 46b9798409653acae695d3f5340defd28687c6e1 [diff] |
am 46b97984: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '46b9798409653acae695d3f5340defd28687c6e1':