| commit | f79ccd551e6829566243d4cd53c516251e54276d | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Fri Mar 18 20:28:31 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 18 20:28:31 2016 +0000 |
| tree | 7e65776361e0952cb7b2cba9f70c1e7d00b068c1 | |
| parent | e26d4ee8f1f962ef04f469060d40ff94029a9457 [diff] | |
| parent | 77e43fac7fa608e36dfa907ed2032292795fa88a [diff] |
resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa * commit '77e43fac7fa608e36dfa907ed2032292795fa88a': Add VPX output buffer size check