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