| commit | 7ce72dac6d0d290ac084b879e1b5c39ccfa7bea2 | [log] [tgz] |
|---|---|---|
| author | Andrii Kulian <akulian@google.com> | Fri Apr 14 17:46:46 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 14 17:46:46 2017 +0000 |
| tree | 8283040810498036b06e49c0917334337cee8cc6 | |
| parent | 632e4afb1a5d3e9ea02f9067bccfe47758bef46f [diff] | |
| parent | aa412973d94018491423555a94301c6bfce2f71b [diff] |
Merge "Hide flag SHOW_WITH_INSECURE_KEYGUARD" into oc-dev am: c66b6ff997 am: aa412973d9 Change-Id: I2e6394ce9c7bc72f5aa4de90e294defeb2dbf222