tree 17e6cb6f3373b87f861b3865fc0ed8a4b46dcf0b
parent 07a5750f1e0c686971d3cf7f56728968c3f14d68
parent 0be4c0e261686c999087f7e971919828e0228b75
author Tao Bao <tbao@google.com> 1500783274 +0000
committer android-build-merger <android-build-merger@google.com> 1500783274 +0000

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

Change-Id: I854cd279927c60f7d8a726775788c75ef1b0b6b3