OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Apr 2013 17:46:22 +0000 (10:46 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Apr 2013 17:46:22 +0000 (10:46 -0700)
Change-Id: Id113b987c3c1423d0af9464a63edcec9840cc870


Trivial merge