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

Merge "reduce differences between Android and upstream" am: 8e063a9d am: c2aa02c0 

am: 7a59916d

* commit '7a59916d':
  reduce differences between Android and upstream

Change-Id: Iafa8a09721271cbb815f96b001f0b9a8dc03b360
parents 007f2ae4 7a59916d
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