OSDN Git Service

am c53ce268: (-s ours) Reconcile with jb-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Sep 2012 15:21:38 +0000 (08:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Sep 2012 15:21:38 +0000 (08:21 -0700)
commit710aeba1ce0bf2d121aaaf659284074750b43c6e
treec0c1005663c89a6cd9c6b66b040b6098b9d78732
parentee04e47216ca947dfc781d1b4116f252dd2aa5a4
parentc53ce26836eccfe9c0bb315d965bc73a9bd7b214
am c53ce268: (-s ours) Reconcile with jb-release - do not merge

* commit 'c53ce26836eccfe9c0bb315d965bc73a9bd7b214':