tree ffb200459b41215b90120dd4443a94fe80c060ee
parent f677ba87180a01fe507a6206bc85c45522f8089e
parent 0dd0a2b9f138c44f50977d0ebcbf308f1af83651
author John Reck <jreck@google.com> 1368737878 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368737878 -0700

am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce

* commit '75084da1b34e0ff9f269b5409d206c213532edbc':
  toUpper() some strings