OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Jun 2013 23:43:54 +0000 (16:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Jun 2013 23:43:54 +0000 (16:43 -0700)
Change-Id: Id191ec4ec57aba482a2e504c2ad8cd5a1af91c53


Trivial merge