OSDN Git Service

Reconcile with jb-mr2-zeroday-deb-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 13 Aug 2013 17:10:08 +0000 (10:10 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 13 Aug 2013 17:10:08 +0000 (10:10 -0700)
Change-Id: Iaf4deada88b56e1b5c6b719f8929091aa6bd0cfb


Trivial merge