tree 362fff8964f1f2cd52beaf5b7445cb117f9c2dc4
parent 25d034cedea702c1f9ecb7a3a3ca977b07b9c3ba
parent 0a18df82f4dea95b7398f8c934341fccbf04eeee
author Elliott Hughes <enh@google.com> 1420845816 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1420845816 +0000

Merge "Clean up some #ifdefs."