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:17:23 +0000 (07:17 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 25 Aug 2012 14:17:23 +0000 (07:17 -0700)
Change-Id: If68758d7bb648f89c4a663ca6bcc419f380518e8


Trivial merge