| commit | c02a18f52f0e556d0a1df0e69d1efc4e022661c3 | [log] [tgz] |
|---|---|---|
| author | Nathan Harold <nharold@google.com> | Thu Apr 06 02:50:52 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 06 02:50:52 2017 +0000 |
| tree | a59379ad92d7c6892fef1e3f77041c93752dc7ae | |
| parent | 436c56bbe54db8d93b933dd12f49f459becc6229 [diff] | |
| parent | 3755323a9d29e346b0d4553ff994b4222222fd93 [diff] |
Merge changes from topic 'ipsec-svc-pick' into oc-dev am: b077f6abd3 -s ours am: 3755323a9d Change-Id: I9ed84510fdd92128bcd0a08b1dd90448e0ae09c1