tree b2d47ffc2e2447a36cdab5f20c9c76385060b94b
parent 616966821c3d3a489ceb0c2662d359aae7bdaafc
parent e3567c48474dd71ae9016c5d6de0e51fe36259a4
author Simran Basi <sbasi@google.com> 1490048931 +0000
committer android-build-merger <android-build-merger@google.com> 1490048931 +0000

Merge "device-tests: As a dependency to tests" am: 26594fce3f am: 318840dfb6
am: e3567c4847

Change-Id: I15832d0b20788df5374930dc1b09fe0ec9ac3122