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