commit | 69d066cd8c83066cea731bac3e4140574107be82 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Tue Aug 06 09:22:54 2019 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 06 09:22:54 2019 +0000 |
tree | cafc663e8de1188d088e618bd101bbf8752b2ef5 | |
parent | 5296dfdb7f60fd2d9dc7f1d699e7dd9e0cefdaf4 [diff] | |
parent | de73da8e53a65f7844a0a520e8a15a79076b5224 [diff] |
Merge "Merge "[RESTRICT AUTOMERGE] CameraServiceProxy: More granularity to NFC / Camera interaction" into qt-r1-dev am: 33c07d1c38 am: 99b8fb7518" into qt-qpr1-dev-plus-aosp