OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 22 May 2013 14:23:04 +0000 (07:23 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 22 May 2013 14:23:04 +0000 (07:23 -0700)
Change-Id: I7100dae7ada8486be79bec2166bf9b8f81cf9e34


Trivial merge