OSDN Git Service

am 49c88288: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Aug 2012 23:09:43 +0000 (16:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 21 Aug 2012 23:09:43 +0000 (16:09 -0700)
* commit '49c8828832705c7ab5462021201c81d59ce8f7e0':


Trivial merge