OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Jul 2013 15:35:04 +0000 (08:35 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Jul 2013 15:35:04 +0000 (08:35 -0700)
Change-Id: I5445989fd1dd6e851d3efe060cf3fc4ae1d104fb


Trivial merge