OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Jun 2013 21:03:32 +0000 (14:03 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Jun 2013 21:03:32 +0000 (14:03 -0700)
Change-Id: If28ee81947b5975843ee6843824e5f7069333251


Trivial merge