OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Jul 2013 16:37:21 +0000 (09:37 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Jul 2013 16:37:21 +0000 (09:37 -0700)
commit0a95b17c93f8ca0a4ed46bdc5797aa81f46f028c
tree130ea2f4111654771de0807a0ffd2fda5ba92365
parentadaa78c901a2f2509965b7acc1cde848dfc6bafe
parentaf06050932e00a03bed7b12c8ac86d90008052f2
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I9a9eea4a01ba78b06cb79a26db9b0bcb52f5fd7b