Commit 50d47038 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by android-build-merger
Browse files

Merge "Track move of tzdata: bionic to system/timezone" am: 867ff783 am:... 

Merge "Track move of tzdata: bionic to system/timezone" am: 867ff783 am: eaff783d am: 88de1bce
am: 6e29efea  -s ours

Change-Id: Ie630add77ad8a6e7e1dc117dccce4195dccb0204
parents 0e2ad520 6e29efea
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment