commit | f2ec62867338d34d71e2f8b6b47793f9cbdefbf6 | [log] [tgz] |
---|---|---|
author | Unsuk Jung <unsuk@google.com> | Sat Sep 12 06:29:37 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 12 06:29:37 2015 +0000 |
tree | 358c222b845f7a23fa9f33d6fc55e9e2a4c8cef5 | |
parent | 95dcb6e7bb19d5a81ce2e1a23560ae5c52f38e52 [diff] | |
parent | 2f505efce02fdb19881603a56cf4544ea10eacd0 [diff] |
am 2f505efc: am 0a0bec55: resolved conflicts for 1168206d to klp-modular-dev * commit '2f505efce02fdb19881603a56cf4544ea10eacd0': Check for microphone feature in video camera recording tests.