[automerger skipped] Merge "Stop invoke initAppOps in Camera default constructor." am: 0890a2b51e am: f98d5cb38b

am: 39a305ea21  -s ours

Change-Id: I2eceedb0e102a4adc0ba031315c64be1eb89b018
This commit is contained in:
Daichi Hirono
2018-09-10 20:19:52 -07:00
committed by android-build-merger

Diff Content Not Available