OSDN Git Service

am cac59514: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 22 May 2013 14:27:41 +0000 (07:27 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 22 May 2013 14:27:41 +0000 (07:27 -0700)
commit73c23d34364c41817c6fc1329b4485506a86b406
tree0b69e7bb5b1d80c6b4c9fce7b03ff0eb5ed9a946
parent5cdb0806cfc71166c67af778ed6bde8ec3e30d4c
parent8c9a2fe055ed956eb24cd57bdbbe386ead95a043
am cac59514: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'cac5951436f3cff8b0e634b52633b193e139c135':