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:03 +0000 (05:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:44:03 +0000 (05:44 -0700)
Change-Id: I232af0988b3526fbc5d309397c361556fb7b09e7


Trivial merge