OSDN Git Service

am f072e3d2: (-s ours) am a108106e: Reconcile with jb-mr1-factory-release jb-mr1...
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:34:09 +0000 (12:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Nov 2012 20:34:09 +0000 (12:34 -0800)
commitf280dc1d7c865f3a04ff656786f0abb9b08f622f
tree3ed3a4f6b18a5ae47f55ab4b124a6104ac670b3c
parentc39bcb00a3c791998163e9f1d4d72fccdf48ca3e
parentf072e3d20531ca452a51bd45f863abb23f2e3968
am f072e3d2: (-s ours) am a108106e: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'f072e3d20531ca452a51bd45f863abb23f2e3968':