tree bf4c485f359e496d7c8d2b0dc0232231283a0377
parent d57287be19ec9db9eca1e72f8ae69d677a3a1b88
parent c247fa136639dd07278b1954e5fba78ade60614c
author TreeHugger Robot <treehugger-gerrit@google.com> 1502752725 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502752725 +0000

Merge "Change protection level from ephemeral to instant" into oc-mr1-dev