| commit | 8b6e0fda4961b424453835068a81dbba6164d9fc | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Thu May 14 01:12:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 14 01:12:37 2015 +0000 |
| tree | e0773729a5455617e66b3e03f19c69ca4a384e6b | |
| parent | 64c166c085301163964a084e1bca2148e2720344 [diff] | |
| parent | 6828f8f39b7baf4968d0984fc4bf3157c86223c5 [diff] |
am 6866d32f: resolved conflicts for merge of cd206b39 to mnc-dev-plus-aosp * commit '6866d32f39576dc9987b0c58fb658c152d7b2919': Fix gettid() on Windows.