tree 19ac4355eac0ee1c73e3ff54dc71345410adc533
parent 576cd45e6298817fa7abb425b5282ff9b56c2367
parent adf8208c526bf22918f3652a41a75788dc4a1dbb
author Steven Moreland <smoreland@google.com> 1511978459 +0000
committer android-build-merger <android-build-merger@google.com> 1511978459 +0000

Merge "Remove subdirs"
am: adf8208c52  -s ours

Change-Id: Ie36a93b20dd0c83978619b3763deb698d0f69c10