OSDN Git Service

am 792d945e: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Sep 2012 15:31:26 +0000 (08:31 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Sep 2012 15:31:26 +0000 (08:31 -0700)
commit8ba2a20617bbc01cff494464bf80d0fa313fddae
treed0c142e7996c22f0fe450562ccde368e94ae2014
parentae1d5bd6dc322705aeb4742d488e5a4ab8db7845
parent792d945e0bf5d6e53e30bd3d2b6aded46cf1f85d
am 792d945e: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '792d945e0bf5d6e53e30bd3d2b6aded46cf1f85d':