OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Sep 2012 17:35:38 +0000 (10:35 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Sep 2012 17:35:38 +0000 (10:35 -0700)
commit1389bc2759c5639b39fe63b9c997009c6c8be9e2
tree6871ab5f9e468a37e0a685455abf46a48b09d73a
parentdaffc1677caf7d85c6d0a751b6da6b4e830fbd73
parent2b0014047a05f34301ab1f9640e93b546ccc1a51
Reconcile with jb-mr1-release - do not merge

Change-Id: I3295bdb670882ec455141c50d2c3f71dab97af67