| commit | 9dbf87543b3a08fe39ba160494207f074294134c | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Mon Sep 16 15:50:50 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 16 15:50:50 2013 -0700 |
| tree | 8d0ce7ae47fee77fc301eff7bc839fd997f7e4bb | |
| parent | 4aad3ca1cf99e56ca34aac9892a8692d2976571c [diff] | |
| parent | 0c126a8471f7a723e000a12995024704f16aead8 [diff] |
am 0c126a84: am a099d1f6: Merge "Camera3: Always set a trigger ID for an active trigger" into klp-dev * commit '0c126a8471f7a723e000a12995024704f16aead8': Camera3: Always set a trigger ID for an active trigger