tree 5c2f1b319d94dbfab846fb584240e32eba5fd9bd
parent 7d03b8d4958fb002235d0306b4da598a575f9406
parent fd632396213f2c413ac2bbad982f7e1e904dc02e
author Tao Bao <tbao@google.com> 1500783065 +0000
committer android-build-merger <android-build-merger@google.com> 1500783065 +0000

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

Change-Id: Ie1721fb7264b3c7277770f5bb44781880ce32f12