OSDN Git Service

Reconcile with jb-mr0-release jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Jul 2012 21:44:42 +0000 (14:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Jul 2012 21:44:42 +0000 (14:44 -0700)
Change-Id: I1e66be92b8c13756b702c251c8b8f93bc8b07a83


Trivial merge