OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Oct 2012 16:19:47 +0000 (09:19 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Oct 2012 16:19:47 +0000 (09:19 -0700)
commit9ff5ea4a69e7fd3ff193eb27af70bb8fb171ad2e
tree03fabd2dce4d9e0e06422f41d8a742499b09635e
parent011646e7e1cb462fecdfa331f8145f05547c2201
parentf69d96ea20536a1b03cd9b9360770d02795c53f6
Reconcile with jb-mr1-release - do not merge

Change-Id: I0c2d60d6f4521289ec4c08902e80034a3c758ca5