tree 12088b80adab8966a62be60b9af768661a03b5f5
parent 7a415131cfa9f44a0a07f5e411dc61d2982baa3a
parent ccf7c39d628ca5a2070c8f7972178156460d6125
author Elliott Hughes <enh@google.com> 1408391575 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408391575 +0000

am ccf7c39d: am 36ba1db4: Merge "Remove unused entries from AndroidConfig.h."

* commit 'ccf7c39d628ca5a2070c8f7972178156460d6125':
  Remove unused entries from AndroidConfig.h.