OSDN Git Service

Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 1 Jul 2013 14:42:15 +0000 (07:42 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 1 Jul 2013 14:42:15 +0000 (07:42 -0700)
commit4886cf512df8ee5a0f60063b1a74ffddb20d2aa6
tree99d99679207653edc3421e8035afb99e6613e5fb
parentf755fa0d8c46a907aa457c55a8164141975467da
parentf8dfc3e5600501301b896b465b66596cf3aa502b
parent6666776df225a4def2867feff03c4707a1774d77
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: Icaf1734bf56551758a818c0b3bbbda7a7eda0924