tree f923e7ca8a75f276b616dbc5bd24e66e70b65af5
parent 011a922223123aa279f6f622da4700307e0dc30d
parent 5f6197edeea02d084a1a042374b8f15e7ed5131f
author Dan Zhang <danielzhang@google.com> 1494580451 +0000
committer android-build-merger <android-build-merger@google.com> 1494580451 +0000

Merge "Fix NullPointerException when getCurrentSuggestions." am: b17f4ddf67 am: fade574422 am: e85f6c9ab4
am: 5f6197edee

Change-Id: I9ee21dec114e5f21115fe8c3b567e2b988186f4f