tree c2f5f0fdd4cc49e201836323dde41145c4e7d315
parent 72a2f171ddf5c1eab7d6ccd47ac2b7ac4fc9c087
parent 2f876f9ee63396e4e0117f85c5b3132cac7e2c9d
author Eino-Ville Talvala <etalvala@google.com> 1379371556 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1379371556 +0000

Merge "Camera3: Always set a trigger ID for an active trigger" into klp-dev