tree accd11aca15da028b675c4314193728aaedfc90f
parent 48b0693c7e74e7c2792e289b3e5a0b6e9c180192
parent e6d34ee345e9a900254b5baae0dbdd4304207259
author Hangyu Kuang <hkuang@google.com> 1468361023 +0000
committer android-build-merger <android-build-merger@google.com> 1468361023 +0000

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

Change-Id: Iae693b1491efb29f378a7bfc46c1ee2c7a258d3f