tree 7b9157f3605fe61883365a5d0116490b25375aa8
parent 2561d06297c50bb31ed2ac9488bd76d40b79f53c
parent b1f180995437b30636a672ed84ee83dec15a2771
author Dan Willemsen <dwillemsen@google.com> 1475546122 +0000
committer android-build-merger <android-build-merger@google.com> 1475546122 +0000

Merge "Remove uses of $(shell)" am: d4118f22f6 am: 75ad2abe2e
am: b1f1809954

Change-Id: I0b3f07dc1e91b00950242f55a22347ec88953c4a