| commit | 0b03b2ff7cf79a70606fe5b3256e67d99d5ebdd3 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jan 09 23:30:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 09 23:30:06 2015 +0000 |
| tree | 362fff8964f1f2cd52beaf5b7445cb117f9c2dc4 | |
| parent | 6a8ff361ad0ecb92a2ca35adce390b139f0dbe37 [diff] | |
| parent | 1de532495b2669ce4fae9b9d20848d78d83813d8 [diff] |
am 1de53249: Merge "Clean up some #ifdefs." * commit '1de532495b2669ce4fae9b9d20848d78d83813d8': Clean up some #ifdefs.