OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Oct 2012 16:45:02 +0000 (09:45 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Oct 2012 16:45:02 +0000 (09:45 -0700)
commit87ed1979a2429a465e931ff303d9d53cf93a32ae
tree2c9f43b421ab165aa6ce9d7911640bceacfd8d21
parent738207def5f691d605ae33d041116829a74513a9
parent2a8ce83c7e86e2d163d5b1c8d59b19abe01a7f5e
parent26aa41008050389bcb083f30bb0da4c43ac479df
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I7ba72441de3b5c1aa8264e079a2808450036380a