OSDN Git Service

Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Aug 2013 16:43:18 +0000 (09:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Aug 2013 16:43:18 +0000 (09:43 -0700)
Change-Id: I84e2f72513f3087ff4628a838efcf471e3695934


Trivial merge