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)
commit13654716fcf078af4b01a1bddde59e3b9caaf51c
tree495fc04a3221cb3600dd65ba7effcb5192c0e6de
parentfa19844a630b4a9b85a23755e1805d3ae38c7b7d
parent8fc78f4d63d209d3d6e329b21aab876dd2c6977c
am 8fc78f4d: (-s ours) am 8e3bf389: am 1210541b: (-s ours) Reconcile with jb-release - do not merge

* commit '8fc78f4d63d209d3d6e329b21aab876dd2c6977c':
  JRO03O