Skip to content
Commit 1234469c authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by android-build-merger
Browse files

[automerger skipped] Merge "[RESTRICT AUTOMERGE] CameraServiceProxy: More... 

[automerger skipped] Merge "[RESTRICT AUTOMERGE] CameraServiceProxy: More granularity to NFC / Camera interaction am: 9971348a am: 433ee38a" into qt-qpr1-dev-plus-aosp
am: 78a356fd -s ours
am skip reason: subject contains skip directive

Change-Id: I53459463221714ea97dab5403de690b0d4bcb653
parents 4c308436 78a356fd
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment