OSDN Git Service

Merge changes from topic "re-enable-ipsec" am: 680525c742 am: 8d306cd78a
authornharold <nharold@google.com>
Tue, 26 Sep 2017 22:39:01 +0000 (22:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Sep 2017 22:39:01 +0000 (22:39 +0000)
commit80b90ed99a29a860be70b7aeb3f6d0dc81575b8b
treed7040cc4a5576a93e28a180e05f59002d124a095
parent458b8cd3024362e285baf1eae1d23cee3b950c29
parent80107540bb70914f8133932c39ff77a9fb39c3ee
Merge changes from topic "re-enable-ipsec" am: 680525c742 am: 8d306cd78a
am: 80107540bb

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