Skip to content
Commit 799f031a 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: I7100db02d39d7d91bb3c2b8eea070a48a8f7c139
parents 4a9fcaf4 45bd14ff 257cc10c
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