OSDN Git Service

am 3a7ff4c7: (-s ours) am a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check...
authorWei Jia <wjia@google.com>
Tue, 25 Aug 2015 05:30:44 +0000 (05:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Aug 2015 05:30:44 +0000 (05:30 +0000)
* commit '3a7ff4c754fcb99c29621ed94b08ed6fb65f6495':
  DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.


Trivial merge