OSDN Git Service

Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" am: 01e368f26d am:...
authornharold <nharold@google.com>
Wed, 26 Apr 2017 17:52:39 +0000 (17:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Apr 2017 17:52:39 +0000 (17:52 +0000)
commit17472fa1c1621b34a552ec467239aab8f78a48b6
tree7c05e6fde395117d941fe055db017321675960a6
parent4480564bedfcf84dc8203f7249238ca3c1c7e459
parent9f218096de824875cd53075aa8b6a8546afc8716
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" am: 01e368f26d am: 939528045a am: 52dab83f7a
am: 9f218096de

Change-Id: Id67890a061c4e7aef91c7dea61e8706cfdd6bc6e
api/current.txt
api/system-current.txt
api/test-current.txt
core/java/android/content/Context.java