tree b9907f0ee5b70b2c614a508b3c16297084b71d54
parent 4fb2825dc29823aef37febff819561630a4a8fba
parent 6b09b895be7eed69af5bffcd551afe9c9216e3c8
author Tao Bao <tbao@google.com> 1500782614 +0000
committer android-build-merger <android-build-merger@google.com> 1500782614 +0000

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

Change-Id: I2b26ced9ffeb278ce01ff2ca7be4057b0ab6c61c