| commit | 29152617e8bb445521b7fd2b1bcce88b9ecf48cc | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Aug 10 08:55:43 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 10 08:55:43 2012 -0700 |
| tree | b584d660f25525a79993513fcd55ec227207ee67 | |
| parent | 7a06b60f697ba0729ad3a2230529a7b493b9cfb4 [diff] | |
| parent | 1ebe2d794e87269798c638b13088b4845441c236 [diff] |
am 1ebe2d79: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '1ebe2d794e87269798c638b13088b4845441c236':