| commit | 878d3578306e5c07ca4614b27fc4e108cd163a38 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 21:27:09 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 21:27:09 2020 +0000 |
| tree | 5e70eb4979c30f73dec4650c23c033b7576f3989 | |
| parent | 25849e90f349b502e27dfa198b99aa69040a4bb0 [diff] | |
| parent | 5c2b09ed11f0a45b6ee7b4f4ac532a6184c4bb8d [diff] |
[automerger skipped] Merge "Merge Android R" am: 4ce8353c92 -s ours am: e9b023fb69 -s ours am: ee357bc8b4 -s ours am: accd3eadf2 -s ours am: 5c2b09ed11 -s ours am skip reason: Change-Id Ibac3b131928e9277193f9f0b22719f759f30943d with SHA-1 b3ab8fdeae is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Stk/+/1422459 Change-Id: I4f4d8906ea061e12b7902bcc159f59465c5bb662