OSDN Git Service

am e410946c: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 26 Mar 2013 19:17:47 +0000 (12:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 26 Mar 2013 19:17:47 +0000 (12:17 -0700)
commitc702060a1b5d640c5e1f3a7f45d40f2d82bd9951
tree7c87d999ada0548db422e0912c604d784ae39bd3
parent4563a73a97be59f9e1bb5aafe1c604f894ebe849
parente410946c085f6a6b679c5e597abf4b40dbd5ba28
am e410946c: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'e410946c085f6a6b679c5e597abf4b40dbd5ba28':