| commit | eaff25a1eb6a0d546b8310ee10fb767eb0af06a9 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Fri Aug 22 21:41:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 22 21:41:19 2014 +0000 |
| tree | 8fbf894e86ec4d3249c177f318b8ab3eb9b56612 | |
| parent | 476b16f66de9fb90024a51470a2397c134189b49 [diff] | |
| parent | 1daa875dc10bc49e8afe28e185b1306f80d4e7f0 [diff] |
am 74446fdc: am 1b185a43: Merge "Ensuring Video APIs are only called when video is available." into lmp-dev * commit '74446fdcf12e30cd9b9f884994e8b82ef07772a8': Ensuring Video APIs are only called when video is available.