OSDN Git Service

am 9ad2c67a: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:48:23 +0000 (05:48 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 May 2013 12:48:23 +0000 (05:48 -0700)
commit040c13b3a5d02edf3b2d1a8a0791145f7130ae9f
tree68a871428d73b28421de0a41ef6440b211c40499
parentf86243115aae7afa7b6c0464adf6cc8bd39dc5d2
parent9ad2c67ab0da915134dc6020f57cce8f7cb30c70
am 9ad2c67a: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '9ad2c67ab0da915134dc6020f57cce8f7cb30c70':