tree 94a557067d2c17e1d44b51e82545d0d364f79276
parent 3f454e7d1cf7103e312f67f745f01f00fa49df13
parent b21a7ad02e43900ea5480e796cb1518bd5829e3f
author John Reck <jreck@google.com> 1418358434 +0000
committer android-build-merger <android-build-merger@google.com> 1418358434 +0000

am b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-dev
automerge: b21a7ad

* commit 'b21a7ad02e43900ea5480e796cb1518bd5829e3f':
  Force-flush state sync on texid change