commit | 33c07d1c382b7e4a61fb48ce981944b255bfdbb5 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Aug 06 08:45:23 2019 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 06 08:45:23 2019 +0000 |
tree | 5882b5aa0563f80c4b8f948f2e9af5cdc417c3c7 | |
parent | 553b8bf2c1d81e36a1556556e1ee380dfd9ac598 [diff] | |
parent | 9971348a0c50ee3bc7cb686872b465b5c88de138 [diff] |
Merge "[RESTRICT AUTOMERGE] CameraServiceProxy: More granularity to NFC / Camera interaction" into qt-r1-dev