commit | f072e3d20531ca452a51bd45f863abb23f2e3968 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:30:08 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:30:08 2012 -0800 |
tree | 9efe68751c858de127b9fe242f4282cd183ec70a | |
parent | a3103f9fe060e91fd6de0975ebe31ddeed88a9e4 [diff] | |
parent | a108106eb489a5e2b657d0afc63872334ba0f791 [diff] |
am a108106e: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'a108106eb489a5e2b657d0afc63872334ba0f791':