tree 04d1cbe231406d84a2f249ad1e51e9bedc1dd734
parent 646db5802a87f2bac137d8f7483a26708ec05cca
parent 04fd23f7e4ba8b1b5a8e49788bcff84452ac84f8
author Aurimas Liutikas <aurimas@google.com> 1478128468 +0000
committer android-build-merger <android-build-merger@google.com> 1478128468 +0000

Merge "Expand the allowed subpaths for test directories."
am: 04fd23f7e4

Change-Id: Ib5d1f71def7417f84f3a9c0dbdee4d8dabf3abae