commit | f72d6f2593aed0c22e09e67422b6708684b3f040 | [log] [tgz] |
---|---|---|
author | weijuncheng <weijuncheng@xiaomi.com> | Tue Sep 11 09:44:22 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Sep 11 09:44:22 2018 -0700 |
tree | ed26d509a5c009edc5e4cdb1eaae67e93d6fed7f | |
parent | 1d82e70ff27c045559776865ea1a9d9b2f062c31 [diff] | |
parent | 45e2f9f2bc3b39b8595e0fd714d7961a1a47bae1 [diff] |
[automerger skipped] Merge "Fix KeyguardDisabledFeaturesActivity disable camera description" into oreo-cts-dev am: 45e2f9f2bc -s ours Change-Id: I58324e2e8d7ca2773d50d1b000fbc5f825d7fcd8