commit | d6ab69d4e7718f2687a432281083001e0b3a45ab | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Mon Jun 08 18:42:52 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 08 18:42:52 2015 +0000 |
tree | b17296b831fd45bfb85e2390eee0a29560679d43 | |
parent | 3590705b751d315d9ecb416eec6b0253c653e17d [diff] | |
parent | ea6ba650ef21b6e909fbd9374b167f508241960b [diff] |
am ea6ba650: am bbf39ae4: Merge "Fix for com.android.cts.verifier.camera.video.CameraVideoActivity" into kitkat-cts-dev automerge: 9d5a03f automerge: 076e7ea * commit 'ea6ba650ef21b6e909fbd9374b167f508241960b': Fix for com.android.cts.verifier.camera.video.CameraVideoActivity