tree ae6d34d4892de9316b842ac6b814e6e8f2927947
parent cf01363c1656d63efa3aa45b4e818b71bf5a67c9
parent a151bf331e801bba1d0a2c99d53b24584f0c4507
author Doney Alex <doney.alex@ittiam.com> 1456508158 +0000
committer android-build-merger <android-build-merger@google.com> 1456508158 +0000

Merge "SoftAvcEnc: Added support for Constrained intra prediction." am: f125dacbe5 am: 4a18e69c8d
am: a151bf331e

* commit 'a151bf331e801bba1d0a2c99d53b24584f0c4507':
  SoftAvcEnc: Added support for Constrained intra prediction.