tree 1ef75a9b82d2ee86b48151b610f7cbe362b0d395
parent 1db1a86bbafb63b9c3cfb7d7f41e468a71fec4cc
parent 42598f4a964bf066bc9a41ed039977f5bfdc0cd9
author Brad Ebinger <breadley@google.com> 1476826257 +0000
committer android-build-merger <android-build-merger@google.com> 1476826257 +0000

Merge "Add support for new SessionManager and EventManager tests"
am: 42598f4a96

Change-Id: I9c629074ca39dfb06bd6b16217ba5e59a9e0a004