tree 03d50680fc47e992fe6fc28d1818b6dd830e6dbe
parent 0771114a8b081663ad3b2a0f60a98aa669b8c03b
parent d720f7d67028b1564b96dee4fe3a988baad4d10d
author Fan Zhang <zhfan@google.com> 1535483449 -0700
committer android-build-merger <android-build-merger@google.com> 1535483449 -0700

[automerger skipped] Merge "DO NOT MERGE Remove old suggestion code."
am: d720f7d670  -s ours

Change-Id: If851fe5c0e36df708919e8efba614a661bb6722f