OSDN Git Service

am 18f95189: Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Nov 2012 15:22:10 +0000 (07:22 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 Nov 2012 15:22:10 +0000 (07:22 -0800)
commit7a396c3972de860a4a5874cd3ff1b6b88a610cc2
treef5c922b232fd38ffb540b555f011baa08780405e
parentecba011fd81386895fda02a7d132eadf5c710ae0
parent18f95189727de29246b663ad4557075678217555
am 18f95189: Reconcile with jb-mr1-release - do not merge

* commit '18f95189727de29246b663ad4557075678217555':