Commit a06ead01 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 

Change-Id: I2a27565cdfdadb8e9045e720d9691ea58ed89bae
parents 40eb3e9a 262b1345 e37a1465
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment