tree 42e82eeb0a7adf033ed867ca44428c2927f43b2d
parent f6370a8ba743df4d9ea63235497915ef01f87176
parent 3b8d2df76d4e38528ee7c47935b9491ad07236b4
author Tao Bao <tbao@google.com> 1523927683 -0700
committer android-build-merger <android-build-merger@google.com> 1523927683 -0700

Merge "tests: Move ResourcesTest into component test." am: 07d0032def am: 9adbc572a3
am: 3b8d2df76d

Change-Id: I3ab2cda5dcb385fa769ad246a656d2e0b30edbda