tree 0c95cfa6c7fd28b15ac08f4d70497562fc384835
parent a0ca0cca28f9fd418d17fb5f9f7aaf80ba9ebe16
parent 5f1ba36af4c50260686187c45d0fb0567e3bb9d1
author Wei Jia <wjia@google.com> 1440622639 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440622639 +0000

am 5f1ba36a: am e9a3a244: am 529c5cbf: (-s ours) am 1fd9995c: am 196a8a9f: am c4757a87: am b504ca53: am 3a7ff4c7: (-s ours) am a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.

* commit '5f1ba36af4c50260686187c45d0fb0567e3bb9d1':
  DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.