OSDN Git Service

Merge "Fix conflicting JavaDoc of TYPE_TEXT_FLAG_NO_SUGGESTIONS" into oc-mr1-dev
authorYohei Yukawa <yukawa@google.com>
Fri, 15 Sep 2017 03:51:23 +0000 (03:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Sep 2017 03:51:23 +0000 (03:51 +0000)
commitc6e9e15b4f787b742ba695f7d42953b643778edb
tree524122bbe5bd22db37be6e6d6ee49dd7832f0d79
parent3715bced3ac8c486a275bcf1ad4a15bcc6af7742
parent7bbe06231fc658f54929695b96f538dccb11d185
Merge "Fix conflicting JavaDoc of TYPE_TEXT_FLAG_NO_SUGGESTIONS" into oc-mr1-dev
am: 7bbe06231f

Change-Id: Ica5ba4969d1961acd7c037cae285d29c69da1407