OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 Jun 2013 19:32:53 +0000 (12:32 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 Jun 2013 19:32:53 +0000 (12:32 -0700)
Change-Id: If2d4012040805ba406dd14909d6a6773b8060eef


Trivial merge