| commit | f97f1232db9adc88d4925ba70e2e3e232ece0b73 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Tue May 05 01:44:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 05 01:44:45 2015 +0000 |
| tree | 81e563a1a40af01cda063de4e1ebe66fee09a44c | |
| parent | 89b695cb8ab18be8e92cdcbfcfa4588169ca300d [diff] | |
| parent | d70ac46e17a0c5844be4b0d447b889b46c33ed4d [diff] |
am 8b9170b8: Merge "Add additional shielding against the ERROR macro." * commit '8b9170b83b14a500222fdf525276cb0bc42c531d': Add additional shielding against the ERROR macro.