| commit | 8fc78f4d63d209d3d6e329b21aab876dd2c6977c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 06 13:56:37 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 06 13:56:37 2012 -0700 |
| tree | f95c24141603250e3a046b147874d2919cbe9627 | |
| parent | aef6938a920f9f1bb56ccd464995798d43b5d8c1 [diff] | |
| parent | 8e3bf38977e2b46db4191d417568fe1c78efac14 [diff] |
am 8e3bf389: am 1210541b: (-s ours) Reconcile with jb-release - do not merge * commit '8e3bf38977e2b46db4191d417568fe1c78efac14': JRO03O