am 6a4edf34: am ae8d7d8e: (-s ours) am 12b225fb: Merge "Remove EGL random multithread...
authorKalle Raita <kraita@google.com>
Thu, 27 Aug 2015 14:47:02 +0000 (14:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:47:02 +0000 (14:47 +0000)
commit370f5d2a4c0b62aca6cbd29eefa4f0cb212e07c0
treeb52b7861d0b8df4140b55895a04ce5db643760ba
parent1b428c0b307c3720bbe3e7905c9fe29e168dc0ad
parent6a4edf34e3a65c02b50d99393092bf5f2cd5b4f7
am 6a4edf34: am ae8d7d8e: (-s ours) am 12b225fb: Merge "Remove EGL random multithreaded resource sharing tests." into mnc-dev

* commit '6a4edf34e3a65c02b50d99393092bf5f2cd5b4f7':