OSDN Git Service

am 8e3bf389: am 1210541b: (-s ours) Reconcile with jb-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Aug 2012 20:56:37 +0000 (13:56 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Aug 2012 20:56:37 +0000 (13:56 -0700)
* commit '8e3bf38977e2b46db4191d417568fe1c78efac14':
  JRO03O


Trivial merge