commit | 1c629b22ebe20437e165b7d6f34ffe258a5ccf84 | [log] [tgz] |
---|---|---|
author | Makoto Onuki <omakoto@google.com> | Wed Aug 01 10:50:41 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 01 10:50:41 2012 -0700 |
tree | af4077d336124c27b68ef35d704d49593b2fecfc | |
parent | 3873f6f83cc1b9ea50548e9f79f2d1696bd77f6e [diff] | |
parent | 3982a90600fbe76c770acc63da1afd77820b254a [diff] |
am 3982a906: resolved conflicts for merge of 67d3ba11 to jb-mr1-dev * commit '3982a90600fbe76c770acc63da1afd77820b254a': Removing code to handle "call" action from QSB suggestion