| commit | 61384bb399e6d3c29d054e956131d140d8f4caea | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Wed Apr 30 15:38:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 15:38:04 2014 +0000 |
| tree | 98438616f9e048f0371574e21b01ecd8dbc0cb25 | |
| parent | b926ff24c76169bcd1b29518d88759585fb59842 [diff] | |
| parent | 5db5d6d307d80011811ffc0db7b29d882c7a631e [diff] |
am 5db5d6d3: am 474dac4d: Merge "stlport: if we can not throw, let us abort" * commit '5db5d6d307d80011811ffc0db7b29d882c7a631e': stlport: if we can not throw, let us abort