commit | f280dc1d7c865f3a04ff656786f0abb9b08f622f | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:34:09 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:34:09 2012 -0800 |
tree | 3ed3a4f6b18a5ae47f55ab4b124a6104ac670b3c | |
parent | c39bcb00a3c791998163e9f1d4d72fccdf48ca3e [diff] | |
parent | f072e3d20531ca452a51bd45f863abb23f2e3968 [diff] |
am f072e3d2: (-s ours) am a108106e: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'f072e3d20531ca452a51bd45f863abb23f2e3968':