| commit | 8cb71c23674a4c136153813707058974632b1637 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 02 15:09:17 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 02 15:09:17 2012 -0700 |
| tree | f4fef1f9e39fa1e429092de52afcb431131ecd7d | |
| parent | 50d7388e6d864858c253ecfde1cf27c09ca2096a [diff] | |
| parent | 3666f42b4574226d17566660ca0945ec30ee528a [diff] |
am 3666f42b: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '3666f42b4574226d17566660ca0945ec30ee528a':