| commit | a6e5f5336387a7d36d74c1697a1ada517cef5c1c | [log] [tgz] |
|---|---|---|
| author | Daniel Erat <derat@google.com> | Thu Aug 20 00:01:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 00:01:31 2015 +0000 |
| tree | c46f349cf69a253337cc82d5da55ea5619e65eda | |
| parent | 6e2ab15e8cc0aecbeca8366df804fababfd4f7be [diff] | |
| parent | 6ada5de7c2c5f17f43dff933ea8b74d6048dc61c [diff] |
am 2e406f64: am 9a995b2c: Merge "Use __ANDROID__ instead of __BRILLO__." * commit '2e406f64bd01395977c66c4afc518b61841f507c': Use __ANDROID__ instead of __BRILLO__.