| commit | 30f7b090978cb56b38adea8f58c68a467fcbea89 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Tue Aug 06 02:05:56 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 06 02:05:56 2019 -0700 |
| tree | 3b79e231e8dcbb03247cd3c267b20ea895b3ac8f | |
| parent | 433ee38af2f10d0615702c3d37ab9d732228c77c [diff] | |
| parent | 33c07d1c382b7e4a61fb48ce981944b255bfdbb5 [diff] |
Merge "[RESTRICT AUTOMERGE] CameraServiceProxy: More granularity to NFC / Camera interaction" into qt-r1-dev am: 33c07d1c38 Change-Id: I9193ce893e220eab614f7f129f49d8c1620a71e2