| commit | 9e829c1fa0138e83e728f15413fceaca00c18b6f | [log] [tgz] |
|---|---|---|
| author | Yabin Cui <yabinc@google.com> | Thu Aug 27 10:46:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:46:39 2015 +0000 |
| tree | ee3b26be086daa9c9cb3124d7da6216c8997109b | |
| parent | 84fd6415e9187c0fd9314f0d5d4a2d4f59a9cecb [diff] | |
| parent | 9565513a81cf468882dc1379696a05cff2758467 [diff] |
am 9565513a: (-s ours) am 5afe0aab: Merge "Update tsan build." * commit '9565513a81cf468882dc1379696a05cff2758467':