| commit | 88e3a57d5f027c7139095ea73ee2e166b7b46bfd | [log] [tgz] |
|---|---|---|
| author | Daniel Erat <derat@google.com> | Thu Aug 27 14:36:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:36:39 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | fce065619c4dbc60e6c2f7b0ecc4a0492948dd2a [diff] | |
| parent | 54d481d08f8d1151413327a39f524ef906b6292e [diff] |
am 28a49acd: am f10e1ed1: (-s ours) am 2e406f64: am 9a995b2c: Merge "Use __ANDROID__ instead of __BRILLO__." * commit '28a49acd40521f9825a0674672c3ad75f952b6d7':