OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 12:57:06 +0000 (05:57 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 12:57:06 +0000 (05:57 -0700)
commitc8c5ad6a323476b85adba337574b72d38649c8aa
tree5ce68ec65af9f9bc1a92c150cb28d40a698b13dd
parent8d1ee30b8c867ac3a5f6daef0bdf97d4ea777cfe
parent1da71728a8d126d8e0697bb7c2efac60360eb4c9
Reconcile with jb-mr1-release - do not merge

Change-Id: Ie5b35b4154bf8cc096620a99382b5137ebb5ca81