| commit | c3a7c3839ee79260682a9c3dcb32e9474daa7481 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:31:17 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:31:17 2012 -0800 |
| tree | fb90bdf484d931322c08707793da1131a96353f0 | |
| parent | ae36f1e9f30d1d3e3951a9e55f084ab4ce229c87 [diff] | |
| parent | 08ea3b10b482d4d08e59e03291d2feb3b361500d [diff] |
am 08ea3b10: (-s ours) am 5535a9e9: am 8a1238b6: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '08ea3b10b482d4d08e59e03291d2feb3b361500d':