tree 14b43a5499fc526bf756921eb08de5d5962853b0
parent ba46fa9310d66239d7f4e0d1d7097b41c0e5869e
parent 829b2a0bf09d6d18d7ee30886f553fa20dcab1d0
author Marco Nelissen <marcone@google.com> 1477425955 +0000
committer android-build-merger <android-build-merger@google.com> 1477425955 +0000

Merge "Prefer software codec with debug property"
am: 829b2a0bf0

Change-Id: Ib5cc5065540f48efaebeb02ecd1bd8036f0e56d1