| commit | 426d0f946054430c36da60a38dffb5525fc57d5c | [log] [tgz] |
|---|---|---|
| author | Daniel Erat <derat@google.com> | Thu Aug 20 00:04:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 00:04:10 2015 +0000 |
| tree | c4bcf2a86228111e0e61409ef8614acba72795e6 | |
| parent | 06b27052295675f753b84eb228b4601d85e7cc25 [diff] | |
| parent | 8181c59263d0bc0897c3c0b68c8ad49294f32488 [diff] |
am 86802aef: am 2e406f64: am 9a995b2c: Merge "Use __ANDROID__ instead of __BRILLO__." * commit '86802aef8bb16d891cc7b46485188191bf581df7': Use __ANDROID__ instead of __BRILLO__.