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