OSDN Git Service

Merge "Update docs to match encryption requirements" into pi-dev
authorRobert Berry <robertberry@google.com>
Wed, 11 Apr 2018 13:49:45 +0000 (13:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 11 Apr 2018 13:49:45 +0000 (13:49 +0000)

Trivial merge