tree 5fb83f5e19fb918c4d5c7fcc4931ba91b80615e0
parent 3eb9882a67167141817faef6556c0393fa6bab72
parent 76ee05d4f6a8ddafd2125db69e7560dab7cb2e8a
author Ian Rogers <irogers@google.com> 1400112042 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400112042 +0000

am 76ee05d4: am d05c7d26: am bcf76242: Merge "Move FLATTENED_PATTERN to inner class."

* commit '76ee05d4f6a8ddafd2125db69e7560dab7cb2e8a':
  Move FLATTENED_PATTERN to inner class.