Commit a05caa7d authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 15e47193: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge 

* commit '15e47193':
parents e4670bcc 15e47193
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