tree 64ddc8a7264e9c21a7747ac20676fbb9f3ef0c83
parent 9eea9b077d739811c67931966357d803a6151c20
parent 3977cc97528df0851d9b671578181d64c6b7a210
author Satoshi Kataoka <satok@google.com> 1381366525 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381366525 -0700

am 3977cc97: am c7f8d54d: Merge "Prepare for changing text color for functional keys"

* commit '3977cc97528df0851d9b671578181d64c6b7a210':
  Prepare for changing text color for functional keys