| commit | 5033b4f237d3748f67b3dbdae4e4c425ca58297d | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed May 06 22:44:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 06 22:44:35 2015 +0000 |
| tree | 2c30e23bd0b17b28adc390c3a76832fb7aa01e73 | |
| parent | 7a2b91f337de4d633cf454971b3552421d5f2c59 [diff] | |
| parent | f97f1232db9adc88d4925ba70e2e3e232ece0b73 [diff] |
am c95ca14a: am 8b9170b8: Merge "Add additional shielding against the ERROR macro." * commit 'c95ca14a87b6baf39b9246a8cd7ab55742463b16': Add additional shielding against the ERROR macro.