tree 1e6a02f65a251529a645a87dfdc5b3a66e11f599
parent 3a268fcec4d9a0e4b5f7807ba1a53d90a6babe36
parent 3a6bad5944af13604bf56be2d22d6344f62e327c
author Chia-I Wu <olv@google.com> 1529228827 -0700
committer android-build-merger <android-build-merger@google.com> 1529228827 -0700

[automerger skipped] Remove software flex pixel formats am: 7bdadae7f0 am: 83e45dd62d  -s ours am: e6bedcc198  -s ours
am: 3a6bad5944  -s ours

Change-Id: I009c54c5ef67e6db6bde24e6ef09d07ac5a06ecd