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:02:22 +0000 (14:02 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Jun 2013 21:02:22 +0000 (14:02 -0700)
Change-Id: Ibaec6294f3598d965dba72d39859f24a76c8933b


Trivial merge