OSDN Git Service

Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 21:59:46 +0000 (14:59 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 21:59:46 +0000 (14:59 -0700)
commit7e107a0903707876c0ad7dd4ee2702fd5baed7ae
tree140c0bf9856e5aa507b4b3410d90b32d588d2f0d
parentbdae7b013938030628577ef3ceb2b9954253c155
parent9a85ed20ee5fcf38aa42cb5b7e5cdbeadc10b727
Reconcile with jb-mr0-release - do not merge

Change-Id: Iea656c0ea3a18a0a9874e271f18c8ebed540feb5