tree eebccf3102d59db21ec62db87f14575ea16fe067
parent f5970785adc7300a764212e8e84223489100f17c
parent a843cbc41147f5d41c2564784d25d29d67c19884
author Damien Bargiacchi <drb@google.com> 1477965477 +0000
committer android-build-merger <android-build-merger@google.com> 1477965477 +0000

Merge "Allow boot clock to be toggled between 12 and 24 hour format" into cw-f-dev am: 71a865d22d am: cb3a109506
am: a843cbc411

Change-Id: I8437c4528acbc2b2b7224baabf45611dbed70446