commit | e7e4928b024e1c72da79a57f477afe9e75c95cb7 | [log] [tgz] |
---|---|---|
author | Lalit Kansara <lkansara@codeaurora.org> | Tue Dec 06 14:38:01 2016 +0530 |
committer | Lalit Kansara <lkansara@codeaurora.org> | Tue Dec 06 14:38:01 2016 +0530 |
tree | 705ea3d859bfcdca12671d76563a8960a3e6800f | |
parent | 6f54d8ec055c01e7f1ca5016b3f023dd65b8c71c [diff] | |
parent | e9f90a21c05c630062ce790e32a4b21405c631bd [diff] |
Merge commit 'e9f90a21c05c630062ce790e32a4b21405c631bd' into reomte Conflicts: src/codec/SkJpegCodec.cpp Change-Id: If35ef478ace8dd4ae4f195d8808d772c65c366b4