tree b9907f0ee5b70b2c614a508b3c16297084b71d54
parent e62f06246ad9f1318926cf849be9a250c4e145f5
parent 248b4f9dcae3a8247c9075682b5b3f7fd882ee3e
author Tao Bao <tbao@google.com> 1500782854 +0000
committer android-build-merger <android-build-merger@google.com> 1500782854 +0000

Merge "Remove the obsolete reference to /file_contexts." am: 6b09b895be
am: 248b4f9dca

Change-Id: Idd17e7d036ef7f92c687441e56f1e5c98c6f6b0c