| commit | b397512231f54391953fa9a71d104c9619f5166b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 12 07:33:29 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 12 07:33:29 2012 -0700 |
| tree | 4cce1ee701e5656d94ba62d36862ab3c591fc350 | |
| parent | b97f4382aba5727f664d92ff73c4b28858fb63eb [diff] | |
| parent | 580904ea01f291b4b52dcea6da6345a2c3a16988 [diff] |
am 580904ea: (-s ours) Reconcile with jb-mr1-factory-release - do not merge * commit '580904ea01f291b4b52dcea6da6345a2c3a16988':