tree 5032a605a8777203352c7f0d3e1b2190ec58a62a
parent 327193d252298d46ab168608e29385ca00538ac9
parent eba11fa5742d1f6913eddc4e363cae6c6ffd6e48
author Jeff Vander Stoep <jeffv@google.com> 1497582088 +0000
committer android-build-merger <android-build-merger@google.com> 1497582088 +0000

Fix "No file_contexts" warning am: e35926e1af
am: eba11fa574

Change-Id: I278bc4d7af6892ecf3c2d259f6d7fd32a34f19ec