OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 25 Jun 2012 14:57:38 +0000 (07:57 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 25 Jun 2012 14:57:38 +0000 (07:57 -0700)
Change-Id: Ib43ec64c9827ceb6956e4f86dcc9439e8a433e16


Trivial merge