OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 15:05:49 +0000 (08:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Oct 2012 15:05:49 +0000 (08:05 -0700)
commit07c338b273ded37774997409771eb9f51dd0ff71
tree79cbbbd745c7ea5a5ef44d8a7a07e34f95d43549
parent62bb3720dc21d015b634ac879b44e4c425330375
parent9d395ac90add21c6959064ac3f718728b4973b5d
Reconcile with jb-mr1-release - do not merge

Change-Id: I3b25f3be4ac925e05cc72ff901944db93a6707af