| commit | be57a193131cfa1eb3d994e165bed8edbb1d3fbe | [log] [tgz] |
|---|---|---|
| author | Robert Snoeberger <snoeberger@google.com> | Fri Jun 21 10:07:18 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 21 10:07:18 2019 -0700 |
| tree | 5b342f851ca4c09d5f72180471a383407e32cff6 | |
| parent | b87ea9ac6be94b07ef7964d85ef984b5cc77e42d [diff] | |
| parent | 6060068d5ab08675dd306700d08fc4b64e3b8697 [diff] |
Merge "Handle case that settings string is JSON" into qt-r1-dev am: 6060068d5a Change-Id: I3386b08801beb7356edb37c5485b29188d8a7c3f