Skip to content
Commit 0d2b287e authored by Daichi Hirono's avatar Daichi Hirono Committed by android-build-merger
Browse files

[automerger skipped] Merge "Stop invoke initAppOps in Camera default... 

[automerger skipped] Merge "Stop invoke initAppOps in Camera default constructor." am: 0890a2b5 am: f98d5cb3
am: 39a305ea  -s ours

Change-Id: I2eceedb0e102a4adc0ba031315c64be1eb89b018
parents f0bb83ba 39a305ea
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