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)
Change-Id: I3b25f3be4ac925e05cc72ff901944db93a6707af


Trivial merge