OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Apr 2013 20:35:34 +0000 (13:35 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Apr 2013 20:35:34 +0000 (13:35 -0700)
Change-Id: Ic29dadd7db4775b7812868535dd2c510a64f0591


Trivial merge