tree f261ac1c93c7f37e52226e56b59808a6e9b97f83
parent 65d7c4722c7cfe5d8bd98bbd3f38bca97901a06a
parent 5806404e4d693699fef2e710fd8ad836815f8852
author Colin Cross <ccross@android.com> 1464885687 +0000
committer android-build-merger <android-build-merger@google.com> 1464885687 +0000

Merge "Remove deprecated Android.mk files" am: ce5b4fee23
am: 5806404e4d

* commit '5806404e4d693699fef2e710fd8ad836815f8852':
  Remove deprecated Android.mk files

Change-Id: I8a87996377bd53a16d330c0df9bfff84c92e10a2