| commit | 88cac38ee21b96ac041b9b349a733a5b441b6b1c | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 23:21:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 23:21:14 2015 +0000 |
| tree | 35353fdad8d490dc49e92f865bdc8d1f0913ad2a | |
| parent | 1b705ed747a56fbab37b169b67eb440621607a38 [diff] | |
| parent | 5aaecd4cf7b9b96a13f61416f10b3022a30274ce [diff] |
am 5aaecd4c: resolved conflicts for merge of 69a4f949 to mnc-dr-dev-plus-aosp * commit '5aaecd4cf7b9b96a13f61416f10b3022a30274ce': SoftAVCDec: Reduced memory requirements