OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 16 Jul 2013 18:19:11 +0000 (11:19 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 16 Jul 2013 18:19:11 +0000 (11:19 -0700)
Change-Id: I8a36562b71e8ca51a52e9e893f3fb302ea414f24


Trivial merge