OSDN Git Service

Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" into oc-dev
authorNathan Harold <nharold@google.com>
Wed, 26 Apr 2017 18:02:49 +0000 (18:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 26 Apr 2017 18:03:00 +0000 (18:03 +0000)
commit35eb324bf17e63a2e28c08484313d195e3f1e7f6
tree95e67412a88fcbe067c3d3c7a3d170ec00019816
parent1c661d1943338f96bda3f0e83e8fa36066b83f53
parentbd62d6aff264b8e8ce4a06ca6417e69bcca3006b
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" into oc-dev
api/current.txt
api/system-current.txt
api/test-current.txt
core/java/android/content/Context.java