| commit | 54d481d08f8d1151413327a39f524ef906b6292e | [log] [tgz] |
|---|---|---|
| author | Daniel Erat <derat@google.com> | Thu Aug 27 11:54:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:54:18 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 2522cc14ca399be8417ba232ce3fe0c033fc9801 [diff] | |
| parent | a6e5f5336387a7d36d74c1697a1ada517cef5c1c [diff] |
am f10e1ed1: (-s ours) am 2e406f64: am 9a995b2c: Merge "Use __ANDROID__ instead of __BRILLO__." * commit 'f10e1ed1b2229700df0cc31cf7c8fb67a1ecbd55':