| commit | 3d93817856e4d8ae5d2e441cbebba1cebda3a3b2 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed May 06 23:09:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 06 23:09:55 2015 +0000 |
| tree | b3049d6e534e8e1751b4af37cc24c717881aacd1 | |
| parent | 418cb20d689f9eb1db809aec992089b0daef1c7b [diff] | |
| parent | 5033b4f237d3748f67b3dbdae4e4c425ca58297d [diff] |
am ac7412c6: am c95ca14a: am 8b9170b8: Merge "Add additional shielding against the ERROR macro." * commit 'ac7412c62fe5250cc77716d9695af26c087e61bc': Add additional shielding against the ERROR macro.