tree 4eabf329e55184dae312404b5018dfa112033444
parent 0a5905c139895dc86eb50406efcb397b5c472427
parent 9c0b12db476d2cf5bb199244ca3ff7fe7daeaae2
author Jin Qian <jinqian@google.com> 1490058599 +0000
committer android-build-merger <android-build-merger@google.com> 1490058599 +0000

Merge "Revert "device-tests: As a dependency to tests"" am: 5b216025ba
am: 9c0b12db47

Change-Id: Iceb0d847f381ede8bf5f426452ca197bb1c86fb7