| commit | 36e37b0f01df80894060f39b0d697a817303d5cb | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Tue Aug 06 23:22:43 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 06 23:22:43 2019 -0700 |
| tree | 50a4e715a7b694074e27149b84a58eefd5b58c8d | |
| parent | 6a1ec1b167a5cfbc0a2c05025cacf0b80023ba63 [diff] | |
| parent | 30f7b090978cb56b38adea8f58c68a467fcbea89 [diff] |
Merge "[RESTRICT AUTOMERGE] CameraServiceProxy: More granularity to NFC / Camera interaction" into qt-r1-dev am: 33c07d1c38 am: 30f7b09097 Change-Id: I8ef7021ffd23761ecb0d6e7426cb857ef3dcd2c1