| commit | 76600808e140a248dcd1fb92eceac830c2df8eab | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Wed Aug 07 06:23:30 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 07 06:23:30 2019 +0000 |
| tree | 50a4e715a7b694074e27149b84a58eefd5b58c8d | |
| parent | 673e5d6d21fbf9f264cf0795620a989048f030f6 [diff] | |
| parent | 36e37b0f01df80894060f39b0d697a817303d5cb [diff] |
Merge "Merge "[RESTRICT AUTOMERGE] CameraServiceProxy: More granularity to NFC / Camera interaction" into qt-r1-dev am: 33c07d1c38 am: 30f7b09097" into qt-qpr1-dev-plus-aosp