Merge "Trivial correction of Camera2 API description"
am: a909dad0c3

* commit 'a909dad0c36542ffbc155f98b4eb054921b1bbd0':
  Trivial correction of Camera2 API description