| commit | ee28cfd8596ae87a17d30086a126d39051f3f0cd | [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 | 25490f1f03e54f77773acf3482d3675f3786ba40 | |
| parent | e4bb229cfb356d41e68af1b5a661bbc7801d2501 [diff] | |
| parent | 2f638c0ca3a82e2711a9894fc2f92472b6c29c17 [diff] |
am c95ca14a: am 8b9170b8: Merge "Add additional shielding against the ERROR macro." * commit 'c95ca14a87b6baf39b9246a8cd7ab55742463b16': Add additional shielding against the ERROR macro.