| commit | b5a2b179bc63841c69a1d5fb4585796528ecf574 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Mon Mar 10 23:36:21 2014 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Mon Mar 10 23:36:21 2014 -0700 |
| tree | c65f7b54453404cce83a713d9d27de593438ce58 | |
| parent | 7149ed22847118bc89dbee5743097092ed954746 [diff] | |
| parent | b786ef9eef39ed1fa1d69e727964ab8e45aa6947 [diff] |
Merge "mm-video: vidc: Fix bugs introduced via merge conflict"