commit | 99b8fb75187a0cb3487e58c3a42594a09eb107c1 | [log] [tgz] |
---|---|---|
author | Eino-Ville Talvala <etalvala@google.com> | Tue Aug 06 02:06:11 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 06 02:06:11 2019 -0700 |
tree | 81609a5bb92db9581a5731a33333c9ece1c757da | |
parent | b7dd2dd9678ff49df176966225505e11ca220bc9 [diff] | |
parent | 33c07d1c382b7e4a61fb48ce981944b255bfdbb5 [diff] |
Merge "[RESTRICT AUTOMERGE] CameraServiceProxy: More granularity to NFC / Camera interaction" into qt-r1-dev am: 33c07d1c38 Change-Id: I49fa5aa1d3e26eba04eac271c20e4b624e0c9019