OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 22 Aug 2012 22:34:35 +0000 (15:34 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 22 Aug 2012 22:34:35 +0000 (15:34 -0700)
commit5b82523d357ffbd542a7274601d2cece380a7e54
tree0b0d3941f15f79bb35c9f5911c89f85f2e945564
parentd19511a6657efc7f1a7e544df04f076223f8fe65
parent779d548dcc70c7fd8da2587c79e43368ffd27f4c
Reconcile with jb-mr1-release - do not merge

Change-Id: Ic793753dd46086b8966181ad8f540e104c1deacc