| commit | 6480d09eec2b8188b623030c971032334739b4e4 | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Wed Mar 29 17:48:02 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Mar 29 17:48:03 2017 +0000 |
| tree | 64ad77610fa706736a020f4100379f3a51df3819 | |
| parent | be3d40cadb8490291512a6d7882791dda9104316 [diff] | |
| parent | 6dcab2bafd847be84c2c2230bbd04af9c45c491e [diff] |
Merge changes from topic 'heapbase' into oc-dev * changes: DRM: more fixes for heap base mapping -- DO NOT MERGE Revert "Revert "Fix decoder instantiation during playback"" -- DO NOT MERGE