OSDN Git Service

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


Trivial merge