OSDN Git Service

am 115b146c: Reconcile with jb-mr0-release jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 27 Jul 2012 22:45:35 +0000 (15:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 27 Jul 2012 22:45:35 +0000 (15:45 -0700)
* commit '115b146cc2dc4b4f9d43b4cd761727d233fc297c':


Trivial merge