OSDN Git Service

am 1fe9666c: am 5af4cc39: Merge "Camera: document supported templates" into mnc-dev
authorYin-Chia Yeh <yinchiayeh@google.com>
Tue, 28 Apr 2015 18:20:09 +0000 (18:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Apr 2015 18:20:09 +0000 (18:20 +0000)
* commit '1fe9666c669f3fefa5f980983f865f2e6934f0aa':
  Camera: document supported templates


Trivial merge