nharold f983d89083 Merge changes from topic 'ipsec-transport-impl' ...

am: 464dc5c07e

Change-Id: I6caf23f5fef995f1ad735ea64b99660a5180799f

2017-04-02 00:19:44 +00:00

..

java

Merge changes from topic 'ipsec-transport-impl'

2017-04-02 00:19:44 +00:00

jni

Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE."

2017-04-01 06:53:03 +00:00

res

…

tests

…