tree 42e82eeb0a7adf033ed867ca44428c2927f43b2d
parent 4d92ca3f6519516c81f046a65643fbbea5920505
parent 9adbc572a3b85d96de9f4d73f687ade90dd2a526
author Tao Bao <tbao@google.com> 1523925557 -0700
committer android-build-merger <android-build-merger@google.com> 1523925557 -0700

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

Change-Id: Ia03cd4b6e5267cfd015190a840d3630648c832c1