am f10e1ed1: (-s ours) am 2e406f64: am 9a995b2c: Merge "Use __ANDROID__ instead of __BRILLO__."

Browse source

* commit 'f10e1ed1b2229700df0cc31cf7c8fb67a1ecbd55':

...

This commit is contained in:

Daniel Erat 2015-08-27 11:54:18 +00:00 • committed by Android Git Automerger

parent 05b2208370 f10e1ed1b2

commit 28a49acd40

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available