tree 9484c6013e25bf6e7f10fa39697a4fd3f931d133
parent e4159f4b0dd1037b0d918ced53b1ba55efc14df2
parent 95d36dd1651369ba8168aeaca9577d5c8e497451
author Android Build Merger (Role) <android-build-merger@google.com> 1507165824 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1507165824 +0000

Merge "Merge "Cosmetic Cleanups for IpSecService" am: 5ade9a228d am: 0bdb9a6e00 am: cc51ef0a47" into oc-mr1-dev-plus-aosp