tree 28a951c544d32e58d94331fdd03a61da132e978f
parent 8f21ddf9e1c425661ef7c8471f9cbb4cd38f4b69
parent f74733a36722d8483a929c295b1a27c6112d0f81
author Etan Cohen <etancohen@google.com> 1479945422 +0000
committer android-build-merger <android-build-merger@google.com> 1479945422 +0000

Merge "[AWARE] Move manager tests from service to manager directory" am: 018f6ec16f
am: f74733a367

Change-Id: Ieae5bc0feb90671fc04db07a644696f90907cea3