tree aa49f06a9cb55feb83dd5a11ef3b525f8e385ac1
parent 3b7703ee23df49c3c368a4270304d2ae52a6e455
parent c611842e1ca2d44922ef6acfe2d38e0143e8045b
author Neil Fuller <nfuller@google.com> 1475743777 +0000
committer android-build-merger <android-build-merger@google.com> 1475743777 +0000

Merge "Remove .mk lines that are just setting the default" am: 8873c3821d am: 6a3c315b25
am: c611842e1c

Change-Id: Ib71490ac084c706b53ae83278f3f8fcd302fc0f2