OSDN Git Service

am 9fc96fac: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:44:27 +0000 (05:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 May 2013 12:44:27 +0000 (05:44 -0700)
* commit '9fc96facfd38ae616ae02ad4c54e5114cc088540':


Trivial merge