OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Sep 2012 14:40:48 +0000 (07:40 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Sep 2012 14:40:48 +0000 (07:40 -0700)
commit0aa60f5a7ef2af9c716762323a0bd5cf561fdb6c
treebc0361e2bb072c7a9948e724113403d6593bc0ee
parent2749d7b5c895bc5f7c363a1a5a12b102aab24fca
parenta77f0fec9293adcec07724971ea083e4e96919c1
Reconcile with jb-mr1-release - do not merge

Change-Id: Ib76f1e00f07e1ef8ce67ad3ca443edb5dcaa33d8