OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 11 Jun 2012 16:20:38 +0000 (09:20 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 11 Jun 2012 16:20:38 +0000 (09:20 -0700)
Change-Id: Ib5c6014cd943de49130829c7c7c68eebdaccd1f9


Trivial merge