tree 73e961a6ccbc084f0d45adbab2829d1473aacdef
parent c55cdb34fb060d19d4f0205b53072ab75e7b2de8
parent 2a0108de20d0b5c03c3f8b5078454a7a954cf638
author Neil Fuller <nfuller@google.com> 1475743712 +0000
committer android-build-merger <android-build-merger@google.com> 1475743712 +0000

Merge "Remove .mk lines that are just setting the default" am: c6bdd166d2 am: 8776bad460
am: 2a0108de20

Change-Id: I631e027c9624dba10c0143c4e683fe5abc18ac16