OSDN Git Service

am 1c63e86f: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Sep 2012 19:46:03 +0000 (12:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Sep 2012 19:46:03 +0000 (12:46 -0700)
commitdde4ef39fb07d0635a18126f180957093a0bee88
tree00356a61649a967a5514ec76f685c74c59e6028d
parent989ae153171218329b3d434540f3581e26076623
parent1c63e86f16aa01f2ef48747cc494bf8f9bba108a
am 1c63e86f: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '1c63e86f16aa01f2ef48747cc494bf8f9bba108a':