OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 21 Jun 2013 18:56:38 +0000 (11:56 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 21 Jun 2013 18:56:38 +0000 (11:56 -0700)
commit70b89b2bb95022a182437996697cce7c15e6d8a7
treed80b14c181fd197af7e12434b524b04961ba10f3
parentc012edbc519b74456530c26719133f96d4574de3
parent3b1ec028751da12b81532f21f5aeea6df7853943
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I38129dc3a8a50f254dbe8155736f45f247deb1af