tree 01ff0b0545450439200b81627bfc43ae60f414c2
parent 9af4e35384b3a11d39ef63ae255b9315a4aef155
parent 83a9962f4062cd91e823a2a948aba3887cbe32aa
author Elliott Hughes <enh@google.com> 1385501650 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385501650 -0800

am 83a9962f: Merge "More compile-time tuning"

* commit '83a9962f4062cd91e823a2a948aba3887cbe32aa':
  More compile-time tuning