tree 55a9c41bb6cccb9aab19ab988c47e262a86913be
parent ead02d1129347fe0b570a64cb2192cb9b2bed401
parent 95212b900b7a9a205d6f8b79dc3fcc07576c18cd
author Stephen Hines <srhines@google.com> 1427926143 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427926143 +0000

am 95212b90: am 31f35975: am 9a98c47c: Merge "Don\'t warn on definition of possibly reserved identifiers."

* commit '95212b900b7a9a205d6f8b79dc3fcc07576c18cd':
  Don't warn on definition of possibly reserved identifiers.