OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 21 Jul 2013 01:25:23 +0000 (18:25 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 21 Jul 2013 01:25:23 +0000 (18:25 -0700)
Change-Id: I68646ef2af902737659f0874fc2bb17612747c3a


Trivial merge