| commit | e4aaeeb7973e4a7d7b843e04dfe63c49739bcde7 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Mon Jun 08 21:15:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 08 21:15:06 2015 +0000 |
| tree | 405ff9825c9def47afc2c0d13a0853bdbc8b90d3 | |
| parent | 82de630601c97376fc418d1d68235d0eb3512c73 [diff] | |
| parent | 6868f07f235c4e9b0f4b128a4e119a742037cbf7 [diff] |
am 6868f07f: am d6ab69d4: am ea6ba650: am bbf39ae4: Merge "Fix for com.android.cts.verifier.camera.video.CameraVideoActivity" into kitkat-cts-dev automerge: 9d5a03f automerge: 076e7ea * commit '6868f07f235c4e9b0f4b128a4e119a742037cbf7': Fix for com.android.cts.verifier.camera.video.CameraVideoActivity