tree 3b79e231e8dcbb03247cd3c267b20ea895b3ac8f
parent d9baadcf15b7ce1884e9d88151f3b4af0adf7462
parent 9971348a0c50ee3bc7cb686872b465b5c88de138
author Eino-Ville Talvala <etalvala@google.com> 1565082157 -0700
committer android-build-merger <android-build-merger@google.com> 1565082157 -0700

[RESTRICT AUTOMERGE] CameraServiceProxy: More granularity to NFC / Camera interaction
am: 9971348a0c

Change-Id: I42a091a3afc56e309b7a98d03dd0138b58c22e64