| commit | b9b362625e75012ce3e40fbf4203c7456ea6ff14 | [log] [tgz] |
|---|---|---|
| author | Chien-Yu Chen <cychen@google.com> | Mon Mar 21 19:13:26 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Mar 21 19:13:26 2016 +0000 |
| tree | d724c3a4603e56d731b95c1e1e61b8c442cb6211 | |
| parent | 1ad7a79ea535dec5e2de0600c59e6b2edc688d21 [diff] | |
| parent | 2a0a707afc131d7ac187d95460a17130bd00b472 [diff] |
resolve merge conflicts of 2830b01 to nyc-dev am: 2a0a707 * commit '2a0a707afc131d7ac187d95460a17130bd00b472': Camera3Device: Validate template ID