Commit c2aa02c0 authored by Nick Kralevich's avatar Nick Kralevich Committed by android-build-merger
Browse files

Merge "reduce differences between Android and upstream" 

am: 8e063a9d

* commit '8e063a9d':
  reduce differences between Android and upstream

Change-Id: I732204dd3c898ec96202bb4d1f66bed3fea5088b
parents fd5b41ae 8e063a9d
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