OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:44:05 +0000 (05:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:44:05 +0000 (05:44 -0700)
Change-Id: Idda6bd6033cfd90ecd4a54ccd3e286940ad12d5a


Trivial merge