| commit | 3916d68580949af407fc82dc796c717155fcdd56 | [log] [tgz] |
|---|---|---|
| author | Cassie Wang <cassiewang@google.com> | Wed Jan 08 18:26:51 2020 -0800 |
| committer | Cassie Wang <cassiewang@google.com> | Thu Jan 09 02:28:45 2020 +0000 |
| tree | f6db63e2eb7ee7af299da211845b9c054b9b35ee | |
| parent | e107c689be3c8c976e58a02b31eb83329f4f5c46 [diff] | |
| parent | 88a9b37a20d4a601baf3b6ca0cfb1ad826dc7e29 [diff] |
Merge branch 'upstream-master' * upstream-master: Pull upstream changes and copy libtextclassifier classes. Port over Icing c++ code from upstream Bug: 146383629 Test: manual - ran 'm -j libicing' with a local Android.bp Test: presubmit Change-Id: I6e9af83a5e09c1401379ecc8009bd00a32f210f3