tree 35a18a9c1e5f9d5545bee43f53f3cb5dfbe6bc2b
parent 276672d19209b3914f721eeb71be19b76602f725
parent d0f1c9d1d3598a23a3d400e6aefc940d1b798bde
author Etan Cohen <etancohen@google.com> 1485826224 +0000
committer android-build-merger <android-build-merger@google.com> 1485826224 +0000

Merge "[AWARE] Minor hardening of manager."
am: d0f1c9d1d3

Change-Id: I182e8c10eea318cf1fd3d3fe4da3275df01f851d