tree f3ba90bd4f829c0064df4e3fe57622d991c83f85
parent f583427b0de21037b9bda8a8a66b1ca4e4e1c9b9
parent 1b1bcd7b7370866bc00ce3361be8d5167bf3e28d
author Robin Lee <rgl@google.com> 1459969962 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1459969963 +0000

Merge "Disallow prepare()-ing over an always on VPN app" into nyc-dev