| commit | 17076cc262ff7e6b384bcb7354983c21ac33a8e9 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Thu Sep 10 00:57:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 10 00:57:12 2015 +0000 |
| tree | ffc7b4f1699a65b80c2077f63053128dea60d066 | |
| parent | a8831ba898480354876d7486475885a267c35194 [diff] | |
| parent | 5a9bb9516d016549730d49cddcc2b2ee0e7a4e93 [diff] |
am 5a9bb951: resolved conflicts for 5d0e02b6 to cw-e-dev * commit '5a9bb9516d016549730d49cddcc2b2ee0e7a4e93': Add double-tap power button to open camera 1/2