| commit | 151d60c6fc0f80db3b623b8a09f779205b3ed934 | [log] [tgz] |
|---|---|---|
| author | Charles He <qiurui@google.com> | Mon Apr 10 13:02:15 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Apr 10 13:02:15 2017 +0000 |
| tree | ea3c5841316f14cf3896f1632c58e0f67cf23682 | |
| parent | c4f821c16e0991f3ad25b06003bd46a803bfe9b3 [diff] | |
| parent | 5744ea2c0d2111a88bfa75d1a2fb531ba90ed841 [diff] |
Merge "VPN: cancel always-on notification with new id" into oc-dev am: 4286c5768d am: 5744ea2c0d Change-Id: Iffe87fb5e4bba4129e0d9109e73b11da01080e20