tree 8fc037ec9075a5bd1a4858678a85444331b9dc0c
parent 17e95f40a534101e2df48f077a8029430adef6c3
parent 78e52bfac041d71ce53b5b13c2abf78af742b09d
author Lajos Molnar <lajos@google.com> 1423277043 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1423277043 +0000

Merge "stagefright: change licensing headers on h264dec omxdl sources" into lmp-mr1-dev