OSDN Git Service

am aef6938a: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Aug 2012 20:35:36 +0000 (13:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Aug 2012 20:35:36 +0000 (13:35 -0700)
commitfa19844a630b4a9b85a23755e1805d3ae38c7b7d
tree495fc04a3221cb3600dd65ba7effcb5192c0e6de
parent813790cb0048c6b91c9dc841dbfa94bdf71e050b
parentaef6938a920f9f1bb56ccd464995798d43b5d8c1
am aef6938a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'aef6938a920f9f1bb56ccd464995798d43b5d8c1':
  JOO37B