| commit | fc40815e5e850b248ea50402139a6e8230830491 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Sat Aug 25 07:21:26 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 25 07:21:26 2012 -0700 |
| tree | 22ce96858d10958b9ae48a570252544aef7bbb6e | |
| parent | 6e3f0232066554db1a71a4902b902ba2315882ce [diff] | |
| parent | 7ec136557b82a01d2f280653cf9aa8cdd1a4fab2 [diff] |
am 7ec13655: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '7ec136557b82a01d2f280653cf9aa8cdd1a4fab2':