OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 25 Aug 2012 14:16:30 +0000 (07:16 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 25 Aug 2012 14:16:30 +0000 (07:16 -0700)
Change-Id: I9439837df0d836e5efbe11b88f3efada5c2faba4


Trivial merge