projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a77a7a5 313f090)
am 313f0906: (-s ours) am 952970c8: DO NOT MERGE: Do not spam activity manager if...
authorJarkko Pöyry <jpoyry@google.com>
Thu, 7 May 2015 22:12:04 +0000 (22:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 May 2015 22:12:04 +0000 (22:12 +0000)
* commit '313f09064de9d7af420aa3ed7d8f12e2abcd46ef':
  DO NOT MERGE: Do not spam activity manager if remote dies.


Trivial merge
Domain: Graphics System / GL;