OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 28 May 2013 14:37:45 +0000 (07:37 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 28 May 2013 14:37:45 +0000 (07:37 -0700)
Change-Id: If34271bddb2819de365f53ba61b744b6598bda57


Trivial merge