OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Jul 2013 21:20:43 +0000 (14:20 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Jul 2013 21:20:43 +0000 (14:20 -0700)
Change-Id: I1d7f0e0f6a4cb8b9363c99a830dc1656424ad49d


Trivial merge