tree 77225e4b42d228cd4ca8e0cfd709c8bef488f0f2
parent cfdd02255eb7b47fe8b553700f3479fbb0cf9050
parent 9f373ee378a79f003ad246a15445fb06724791b9
author Cassie <xih@google.com> 1519793236 +0000
committer android-build-merger <android-build-merger@google.com> 1519793236 +0000

Merge "Add documentation for SECRET_CODE_ACTION according to API review process." am: e6691d8e89 am: f29d208045
am: 9f373ee378

Change-Id: I9dcb76126e9cb06a7967f3f003b78fe605b69167