OSDN Git Service

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


Trivial merge