OSDN Git Service

Merge "Update docs to match encryption requirements" into pi-dev
authorRobert Berry <robertberry@google.com>
Wed, 11 Apr 2018 14:10:28 +0000 (07:10 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Apr 2018 14:10:28 +0000 (07:10 -0700)
commited11ba618201ee51069a16dad46915a3ff954825
tree65837afc205a19dc8c90815937a3f91442cddabe
parent2e3cc06ae976af0616eadf2f2be3c783ddb8b05e
parentbfa13fe76fcb8cbe801f3f4f0045aedafb7cb668
Merge "Update docs to match encryption requirements" into pi-dev
am: bfa13fe76f

Change-Id: I81f6a613bc8ef123ce33f53bfc6a44092d72a7a9