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

am 7c8af225: (-s ours) Reconcile with jb-mr2-release - do not merge 

* commit '7c8af225':
parents 32847738 7c8af225
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