Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c0d6052 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for merge of... 

am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master

* commit '105d879c':
  Stop hard-coding sample 12- and 24-hour times.
parents 2c705626 105d879c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment