OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Aug 2012 15:27:33 +0000 (08:27 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Aug 2012 15:27:33 +0000 (08:27 -0700)
commit1b488abc8e4547e4b553b50320c58d52dea8fe8a
tree7302c2efa9b724972d001869dd907718d9b8fdf2
parentd007dc12c677ea42fd4046a49558bda7189e6746
parent741fac3fee5c55583badad75ffe0e02a66affd4d
Reconcile with jb-mr1-release - do not merge

Change-Id: I444e336418583d709973a26579a4f1027ca4abfa