OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 15:04:39 +0000 (08:04 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 15:04:39 +0000 (08:04 -0700)
commit72034c6c5ff3f2114f9ed4dbade58e8fabddad03
tree5ce68ec65af9f9bc1a92c150cb28d40a698b13dd
parentc8c5ad6a323476b85adba337574b72d38649c8aa
parent61832433e422ff0d587d3e89f55776050a3d4162
Reconcile with jb-mr1-release - do not merge

Change-Id: I81df464c8faae1c41e8e1b8f0da8337e64c3fd09