OSDN Git Service

Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" am: 01e368f26d am:...
authornharold <nharold@google.com>
Wed, 26 Apr 2017 17:38:58 +0000 (17:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Apr 2017 17:38:58 +0000 (17:38 +0000)
commit9f218096de824875cd53075aa8b6a8546afc8716
tree88342ac4fb103e1f9372b567bf85bcc7919a0172
parentc8dda2ad63b38ebc5df104447281189c0bedd05e
parent52dab83f7ad282b43c1ea74c7ee4a0c6f4906615
Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" am: 01e368f26d am: 939528045a
am: 52dab83f7a

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