Commit 7a59916d authored by Treehugger Robot's avatar Treehugger Robot Committed by android-build-merger
Browse files

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

am: c2aa02c0

* commit 'c2aa02c0':
  reduce differences between Android and upstream

Change-Id: I177f9037e2080b643f5b15067ffce198c258797c
parents 007f2ae4 c2aa02c0
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