tree a9ab7093be429395dcfc6ea356ccf6f605e130fd
parent f37a2d1f10401fa673cb015d00527e1b994a3ef9
parent f48a77debbd9751f031ea91f7c908491656c42e6
author Wei Liu <luciferleo@google.com> 1441317748 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441317748 +0000

am f48a77de: Merge "Fix the NPE of testSingleLine." into lmp-sprout-dev

* commit 'f48a77debbd9751f031ea91f7c908491656c42e6':
  Fix the NPE of testSingleLine.