tree 27d492d6f7b31c0c7b0088ef9ae728ac1b6d87e2
parent cbc723a857fc9c72e6eba7884cd0086edad114c1
parent cd4be8b7e09ea462df417ee1f462752620d3aca8
author Etan Cohen <etancohen@google.com> 1479946295 +0000
committer android-build-merger <android-build-merger@google.com> 1479946295 +0000

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

Change-Id: I47e247992f6084dfbabc898e58b9ade435626f16