tree ec5c2aebaeef8bf4011194fb47ce8b246a2746ad
parent d6a6f189eee1cb84704bf6727529ebfeafb268c9
parent ae50011a7e28f54fe1d1e48855e6387ef52b1a32
author Chiao Cheng <chiaocheng@google.com> 1379722669 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379722669 -0700

am ae50011a: am fa35772a: Merge "Adding string resources." into klp-dev

* commit 'ae50011a7e28f54fe1d1e48855e6387ef52b1a32':
  Adding string resources.