Skip to content
Commit fabda589 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: Ife328fef3a7cc1a88562fd88a85daa626b19c930
parents 1bc14ed9 00416842 b543526c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment