OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Oct 2012 14:31:08 +0000 (07:31 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Oct 2012 14:31:08 +0000 (07:31 -0700)
commit9acbd28e7c22df3f5f59974bf199f08622941248
tree9a3910b32d912bdb237ef87dbd297fe2d4dabe44
parent0c434b58efa2dbe21ce9b8d20e6bc0328147080b
parentbbbeeb3c6f2a9a09b1ec952ba9a443f248f922e8
Reconcile with jb-mr1-release - do not merge

Change-Id: I598988c7b0ec650064de569c6120b27c724c478e