tree ef7f19f953256e947e956069787e8a628af225c5
parent 110bc6a50fb0c06053bef83afe5075f7e25c5093
parent e0ec2a956840fa70387883f422b6020c1dfc6bad
author Mathias Agopian <mathias@google.com> 1376611165 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376611165 -0700

am e0ec2a95: Merge "Fix ES2 composition on some devices" into klp-dev

* commit 'e0ec2a956840fa70387883f422b6020c1dfc6bad':
  Fix ES2 composition on some devices