tree 376d46b512c83ac197dadb3c6821ee22db881816
parent ac435657413ba417c04d8185ff1438798782196b
parent af9d9f9b3ed6f8059e547968938b94e186f21ffe
author Lajos Molnar <lajos@google.com> 1467152804 +0000
committer android-build-merger <android-build-merger@google.com> 1467152804 +0000

Merge \"media: document rotation and scaling issues for MediaCodec\" into nyc-dev
am: af9d9f9b3e

Change-Id: Ie9d890df1b77c8fd79766e5ea329e5f8db4a94eb