| commit | b936dfcdbf0e5677593e3c2758180beb2d7078fb | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Feb 05 02:31:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 05 02:31:32 2015 +0000 |
| tree | 98c66a22d84ae25d5e361b0e1c6cdd2ff1c010fa | |
| parent | 44fdd5d15a8851e4053af168e7235b30a5f4d34d [diff] | |
| parent | 1dee489ceaa9dfb6b6609f97380f20b0753eb2c1 [diff] |
am 1dee489c: Merge "Stop using #if for conditional compilation." * commit '1dee489ceaa9dfb6b6609f97380f20b0753eb2c1': Stop using #if for conditional compilation.