tree c9f1cf74677c8904a71aff1297716af384fa350e
parent 9ba19183e76cde3699d741c17e244a9c61b6b206
parent cd56a2822bf99d79b712326f2d439c26c52ccf8e
author Jay Shrauner <shrauner@google.com> 1377713096 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377713096 -0700

am cd56a282: Merge "Cap number of GAL results in Dialer" into klp-dev

* commit 'cd56a2822bf99d79b712326f2d439c26c52ccf8e':
  Cap number of GAL results in Dialer