| commit | 5fb2052d70a135e8b040630205a44c9de9961fcb | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Sep 28 13:01:40 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 28 13:01:40 2012 -0700 |
| tree | c45469e5ca87d69a5f268419f5fea8223ebca2af | |
| parent | 137650d1bb5f3ede15a0e8f053e5279763cc6f5d [diff] | |
| parent | 1d55338d613f0b4f4dd35de75d1a40de51a7bf31 [diff] |
am 1d55338d: (-s ours) am 91f71ca3: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '1d55338d613f0b4f4dd35de75d1a40de51a7bf31': JZO54J