tree d6f53e81e8a9aa8cda5ffb51e5ff3c6a29688523
parent 934c8015d515f96c1f97255b48357da922cf626a
parent f800969d351a72b79da2944a4a971ea10bee3cc2
author Elliott Hughes <enh@google.com> 1408469961 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1408416269 +0000

Merge "Remove unused defines from <features.h>."