| commit | 8181c59263d0bc0897c3c0b68c8ad49294f32488 | [log] [tgz] |
|---|---|---|
| author | Daniel Erat <derat@google.com> | Wed Aug 19 23:59:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 19 23:59:17 2015 +0000 |
| tree | 63d43dfd6ac518da92899d041c438c5c18d44072 | |
| parent | ace20c353dd92aea37397847ed127612307c75c9 [diff] | |
| parent | 6ada5de7c2c5f17f43dff933ea8b74d6048dc61c [diff] |
am 2e406f64: am 9a995b2c: Merge "Use __ANDROID__ instead of __BRILLO__." * commit '2e406f64bd01395977c66c4afc518b61841f507c': Use __ANDROID__ instead of __BRILLO__.