commit | e86fb8bffa22a684856c58f7c586a36654cee8d5 | [log] [tgz] |
---|---|---|
author | Christopher Ferris <cferris@google.com> | Thu May 14 01:51:11 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 14 01:51:11 2015 +0000 |
tree | e0773729a5455617e66b3e03f19c69ca4a384e6b | |
parent | 8b6e0fda4961b424453835068a81dbba6164d9fc [diff] | |
parent | ff35904d2659b2a5baff3d72b6ab28cf6bbb7dbd [diff] |
am 6ceca9dc: resolved conflicts for merge of 428fad97 to mnc-dev-plus-aosp * commit '6ceca9dcecc2287ec9756728f46e1fb331e1edb0': Remove libbacktrace definition of gettid.