| commit | 24b90915a10e2ccc8e1090364956cf79470dff52 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Wed Jun 10 00:46:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 10 00:46:48 2015 +0000 |
| tree | 9221534061da689381081f81b1936dcd335843da | |
| parent | ac26ea8a79ff342f880eb04eedb82e983370a762 [diff] | |
| parent | 6c4fc3a08e9ca52a36f7fc83b783185da34abc12 [diff] |
am 6c4fc3a0: Merge "Change wtf errors from ASSERT to ERROR." * commit '6c4fc3a08e9ca52a36f7fc83b783185da34abc12': Change wtf errors from ASSERT to ERROR.