diff options
| author | Xin Li <delphij@google.com> | 2019-10-26 21:52:26 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-26 21:52:26 -0700 |
| commit | 9059e1c8ff8b21827f9ecbcaf1d911e4aa45c60c (patch) | |
| tree | 2b7bf8a5732a231d431554d077977dd16f5498f8 | |
| parent | 5504efc1d5ace9badc848a152daebc11bf35588c (diff) | |
| parent | 153f3acf1794dd72d35662007f0e8516843a5c0c (diff) | |
| download | SafetyRegulatoryInfo-9059e1c8ff8b21827f9ecbcaf1d911e4aa45c60c.tar.gz | |
[automerger skipped] Merge Coral/Flame into AOSP master am: e86cdce2b1 -s ours
am: 153f3acf17 -s ours
am skip reason: change_id Ie5ef0e7550a78f7469e49e02aff5732375eabff9 with SHA1 929e3af7ed is in history
Change-Id: I9eeafcc72036bd2445ba6b42ac8c3215e05a26f8
0 files changed, 0 insertions, 0 deletions