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)
commit7ae6ae7e3a285a4642710dee74b23cc7e14eb041
tree0b69e7bb5b1d80c6b4c9fce7b03ff0eb5ed9a946
parent54f49b22c70ef7e8dde54f2ec05c8be861922fbc
parentcac5951436f3cff8b0e634b52633b193e139c135
am cac59514: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'cac5951436f3cff8b0e634b52633b193e139c135':