tree b7856099e479f8bfe37a41e9f75939170c27f834
parent 327a5119250f91f9a1174390bda8ebcd2ed79651
parent 367da66255269aaac22006b032bbe6708b9595bb
author Courtney Goeltzenleuchter <courtneygo@google.com> 1507731887 +0000
committer android-build-merger <android-build-merger@google.com> 1507731887 +0000

Merge "Move include in prep of Android.bp support"
am: 367da66255  -s ours

Change-Id: I78cdaca76d3fb39e29de94b5a467e72664393e8b