| commit | a72dfdc07a405a688cac12ec1f2c572d13cc8717 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Feb 05 02:36:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 05 02:36:49 2015 +0000 |
| tree | 4fa8e9e13a6d2a95d22b2ab0ed7f36c117af29fc | |
| parent | 495952fef207c0ad01310b00be1683ca0b4a86c1 [diff] | |
| parent | b936dfcdbf0e5677593e3c2758180beb2d7078fb [diff] |
am b936dfcd: am 1dee489c: Merge "Stop using #if for conditional compilation." * commit 'b936dfcdbf0e5677593e3c2758180beb2d7078fb': Stop using #if for conditional compilation.