| commit | 3ee274030d033d8926b4f079a5a1d6e5385f431a | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Mon Mar 20 23:42:22 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Mar 20 23:42:22 2017 +0000 |
| tree | 47bae6e34cee943181b7df60384a68497a2c0d57 | |
| parent | 7ce8eb178c4f1b06bdec75cbe0843ee1fd1b5976 [diff] | |
| parent | e13b559750734bf826efaf737297364a55c51594 [diff] |
Merge "ITokenManager in hal manifest." am: bd3a930386 am: f69517c298 am: e13b559750 -s ours Change-Id: Ic7e94f49277aa8b6141a21afd3b97841a9b118b1