tree 6836b8b591bd91fb9d7ef7f00675fcc65b6b8585
parent 38c26fba02e512c0391878eb6bfc2ed1a88443de
parent 67f98ee9eafec11a81c018bce170a81481e52a7a
author Hangyu Kuang <hkuang@google.com> 1468360766 +0000
committer android-build-merger <android-build-merger@google.com> 1468360766 +0000

Merge \"media: Add colorAspect support to SoftAVC decoder.\" into nyc-mr1-dev
am: 67f98ee9ea

Change-Id: Ie241857c98ffc10fe00412a603e95bb20c0636f5