am 0671966c: am 1fe9666c: am 5af4cc39: Merge "Camera: document supported templates" into mnc-dev

* commit '0671966cabd808c7f54cee684018084abe386634':
  Camera: document supported templates