tree ffc7b4f1699a65b80c2077f63053128dea60d066
parent a8831ba898480354876d7486475885a267c35194
parent 5a9bb9516d016549730d49cddcc2b2ee0e7a4e93
author Jorim Jaggi <jjaggi@google.com> 1441846632 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441846632 +0000

am 5a9bb951: resolved conflicts for 5d0e02b6 to cw-e-dev

* commit '5a9bb9516d016549730d49cddcc2b2ee0e7a4e93':
  Add double-tap power button to open camera 1/2