am b7b5cdc0: am 3d7e98b7: am b10d72b0: am 4abf3951: am 594279cd: Merge "Camera: fix wrong String.format argument" into lollipop-cts-dev automerge: 958c801

* commit 'b7b5cdc0de4bfacc672b763758b0cc9c89b24bfd':
  Camera: fix wrong String.format argument