OSDN Git Service

Reconcile with klp-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Aug 2013 21:44:03 +0000 (14:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Aug 2013 21:44:03 +0000 (14:44 -0700)
Change-Id: Ic55943955deea3d844a22c766f3a389e6793925a


Trivial merge