tree 6cb3041995db77cbdb01425472b4ce58333fb358
parent c95297654f7987d6ca434d6105d72b48b8793345
parent 7060ae081b9d82f1f3e1a7d9a0899d52590371bc
author Etan Cohen <etancohen@google.com> 1490800470 +0000
committer android-build-merger <android-build-merger@google.com> 1490800470 +0000

Merge "[AWARE] Fix unit tests" am: de8e09409b am: c24d7f781a
am: 7060ae081b

Change-Id: I7e90e4c0853457fa49335a48b20d74c3afb9ba1b