tree 55cc7c6323aab50f527b9a090edb7235282a5645
parent 0f03d771b29ff0fc6919a514c56128de9a5ecd5e
parent 9e197141f8249e36d3f19aeda332ae40dac7da05
author Jeff Brown <jeffbrown@google.com> 1339698811 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339698811 -0700

am 9e197141: Merge "Add new ASSIST key and map it to the global assist intent." into jb-dev

* commit '9e197141f8249e36d3f19aeda332ae40dac7da05':
  Add new ASSIST key and map it to the global assist intent.