tree 4af19ddcba61833605c6a5c50b074edd924abe8c
parent 30fa700241717053d3080dea146718b83b30ec5c
parent bd3a93038644b7afea1208eb3fc7a98760959f27
author Steven Moreland <smoreland@google.com> 1490052942 +0000
committer android-build-merger <android-build-merger@google.com> 1490052942 +0000

Merge "ITokenManager in hal manifest."
am: bd3a930386

Change-Id: I94fcbf19a61626573782269023556875c52ca97c