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