tree c584ee88007a11b346c2fcaa584d93d415caf583
parent c8591c04f7dd160eecab2a68970a9ea96938de69
parent 4a693937498f1cdf67b33aede9c1abe869a582e1
author Simran Basi <sbasi@google.com> 1513038215 +0000
committer android-build-merger <android-build-merger@google.com> 1513038215 +0000

Merge "base_rules.mk: Copy LOCAL_TEST_DATA to testcase folders." am: 9098fd8905 am: d78d01deec
am: 4a69393749

Change-Id: Ibd4d51414827385e0b2e18505c575ca25fee6da5