OSDN Git Service

am d1976678: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 8 Aug 2012 15:18:46 +0000 (08:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Aug 2012 15:18:46 +0000 (08:18 -0700)
commit379817249e142c354b8431bbaca30ba606be80d8
tree3cceee2829a5523b8d658151089eccc7cf1a239f
parentb494a1504a7f988632e79ecaa372ab499b6fa1ad
parentbbd0be83006a531fc15d0260e79a71e2acb034a4
am d1976678: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd1976678886722081e899608e1ac91198019b54a':