| commit | 2ae5d0f01f16334a4b48f7f52148ef013c9fb0a7 | [log] [tgz] |
|---|---|---|
| author | Kiyoung Kim <kiyoungkim@google.com> | Fri Apr 12 17:48:54 2019 +0900 |
| committer | Kiyoung Kim <kiyoungkim@google.com> | Fri Apr 12 17:48:54 2019 +0900 |
| tree | f0bfe6233f25618d67bc3b92065eb332c33b8347 | |
| parent | a8264077fd0cce0137844d02ff62c76fa5da0c41 [diff] | |
| parent | bb8b7e57c2a7d36213253829d4401003d526d8a9 [diff] |
resolve merge conflicts of bb8b7e57c2a7d36213253829d4401003d526d8a9 to qt-dev-plus-aosp Bug: None Test: m -j Change-Id: Ibb7534158f4e3c9daa8837108602779921cd313f