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