OSDN Git Service

Merge changes from topic "re-enable-ipsec" am: 680525c742 am: 8d306cd78a am: 80107540bb
authornharold <nharold@google.com>
Tue, 26 Sep 2017 22:49:36 +0000 (22:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Sep 2017 22:49:36 +0000 (22:49 +0000)
commita61d0899de2cf948a920b93d8d0a4461c9b0da82
treed884ba8670efc1aff465f4404774ef2e9c4184a6
parent7bbe9c70f308399675783696f4af1c2da5ce4e18
parent80b90ed99a29a860be70b7aeb3f6d0dc81575b8b
Merge changes from topic "re-enable-ipsec" am: 680525c742 am: 8d306cd78a am: 80107540bb
am: 80b90ed99a

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