commit | 98a455908ec9982f673005b3193b8054b9ae845b | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:09 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:09 2020 +0000 |
tree | c36bdc1bb46d0a04443ad7fa1e07eb1de8f266b2 | |
parent | 6aa1849549aec51a4cbc042e9f5a12c9bd0a33a5 [diff] | |
parent | 5b1541888ce85b4030717d99d2d7743331c3d592 [diff] |
[automerger skipped] Merge Android R am: 4dbc1203a9 -s ours am: 4ea7426a1b -s ours am: f901b2a776 -s ours am: 5b1541888c -s ours am skip reason: Change-Id I3c6248f1992b2d2eb1df18f1af5f75a68f8dbc16 with SHA-1 555a4df687 is in history Original change: https://android-review.googlesource.com/c/platform/system/timezone/+/1422590 Change-Id: I91f9dd0cf1f8c9dde14a33af1336f1fd4dbf11f4