Skip to content
Commit 9d42e438 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: I9936340ef1544aad7b8115dc37e3fb9094ed0e2d
parents 53d86f6e 1d3ff5b4 6037ec56
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