OSDN Git Service

Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release ...
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Aug 2013 19:09:27 +0000 (12:09 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Aug 2013 19:09:27 +0000 (12:09 -0700)
Change-Id: I498651fc3fa9b021570780e8b8848a806c31962f


Trivial merge