| commit | 7b833420c3a6adf07597a65223bd17997dc30fbc | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 05:59:10 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 11 05:59:10 2012 -0700 |
| tree | 886e6b8e16ce46d7f2e2c3116dffe53509d5b3f3 | |
| parent | 107257a825b378c62e48c23063308472188a6146 [diff] | |
| parent | e4c22cb38a1a4803f70037a1637c8ca26d60bd89 [diff] |
am e4c22cb3: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'e4c22cb38a1a4803f70037a1637c8ca26d60bd89': JOP10E JOP10D JOP10C JOP10B