| commit | 2e406f64bd01395977c66c4afc518b61841f507c | [log] [tgz] |
|---|---|---|
| author | Daniel Erat <derat@google.com> | Wed Aug 19 23:55:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 19 23:55:00 2015 +0000 |
| tree | 29bc3a93cc321b16566f4dbd2b73ba075a7e9e86 | |
| parent | cbc6b915c90b31c2c1cc9a56d23280ac51f6d329 [diff] | |
| parent | 9a995b2c8fe4ee0567e850f7f63bfd661974f6e7 [diff] |
am 9a995b2c: Merge "Use __ANDROID__ instead of __BRILLO__." * commit '9a995b2c8fe4ee0567e850f7f63bfd661974f6e7': Use __ANDROID__ instead of __BRILLO__.