tree 72fa44dff8eed1b9791e582cc17640af7c55115a
parent 7b1ae22837c52030dcba4df4137cd24bc8b498c8
parent 06746184c9695a1ace1f403379b2d2b27a4bcbcf
author Robert Carr <racarr@google.com> 1461269308 +0000
committer android-build-merger <android-build-merger@google.com> 1461269308 +0000

Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev am: 37696cccd8 am: 674bedee2e
am: 06746184c9

* commit '06746184c9695a1ace1f403379b2d2b27a4bcbcf':

Change-Id: I926a405cc381bf6db4e705e92e568c41314f1aa7