commit | 85e19fa4fa66b48d3b406015be4c9ea0767e3b33 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Apr 11 07:50:52 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 11 07:50:52 2013 -0700 |
tree | d6f40be5e8f46e481d2b00ad5e4c6a58b320138b | |
parent | 778608788d4c3fe5f87d08c772c05d5afd794fca [diff] | |
parent | e78d87df3253516a93c1042beabe0edfe782a170 [diff] |
am e78d87df: Reconcile with jb-mr2-release - do not merge * commit 'e78d87df3253516a93c1042beabe0edfe782a170':