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