| commit | a7d0ade12d96559997d102ea7c9a821815d4deb0 | [log] [tgz] |
|---|---|---|
| author | Long Ling <longling@google.com> | Fri Sep 13 04:16:38 2019 +0000 |
| committer | Long Ling <longling@google.com> | Fri Sep 13 04:18:49 2019 +0000 |
| tree | c5e2aadabe20ba16b414bfa85591453ceef56aaf | |
| parent | 0a7c50d39a0096af1357c48166817dccfbbbff30 [diff] | |
| parent | eae0ae9cd0e724e5c4815857328b6a19b9bcd0a5 [diff] |
resolve merge conflicts of eae0ae9cd0e724e5c4815857328b6a19b9bcd0a5 to master Bug: 140823887 Test: Manual test with Calculator app Change-Id: I18e225dd74bbdb227d891f33b823d38112b05c17