tree 17e6cb6f3373b87f861b3865fc0ed8a4b46dcf0b
parent b94ba1a5e4fa23fc15dda7fd1c8b6c4be69a5cd6
parent 98e02adb75b472d1a883b52503f33b82495590d2
author Tao Bao <tbao@google.com> 1500783545 +0000
committer android-build-merger <android-build-merger@google.com> 1500783545 +0000

Merge "Remove the obsolete reference to /file_contexts." am: 6b09b895be am: 248b4f9dca am: fd63239621 am: 0be4c0e261
am: 98e02adb75

Change-Id: Iad83b4b701c9a382510b936df94a65911939a919