OSDN Git Service

Merge changes from topic 'am-e2002a7381854865a514803d2de26232' into oc-dev-plus-aosp
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 12 Apr 2017 20:54:56 +0000 (20:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 12 Apr 2017 20:54:59 +0000 (20:54 +0000)
commit9a5d0477508ed7ff2a912a89a46959fce94e5b04
tree03b381d6ccc74d37c7d3e7d48da399fedac4dafa
parent5881209cac1993d41ab27434a5c3cf4b248c8fc5
parent37f48f4596947a65550a7150a87ef2acee9e5fd1
Merge changes from topic 'am-e2002a7381854865a514803d2de26232' into oc-dev-plus-aosp

* changes:
  Merge changes from topic 'ipsec-api-tweaks' am: fddf677b8b am: 176bfb58c6 am: a237a34085
  IpSecManager and IpSecAlgorithm API Tweaks am: 6045429b35 am: 9c2428ad4d am: 99c50add4f