summaryrefslogtreecommitdiffstats
path: root/core/java/android/util/TimeUtils.java
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-11-09 12:04:00 -0800
committerJessica Wagantall <jwagantall@cyngn.com>2016-11-09 12:04:00 -0800
commit996c5b93d6e8d5f3e5d5248e08a32f401ebfcb28 (patch)
tree55ae2221ea34bc1bd0c3a407f89ed35e2bdd4212 /core/java/android/util/TimeUtils.java
parent8ec45de6fca5d470f27a0272c2b84a112ef9d2e9 (diff)
parentef525e8d721a69310044eca14993df8b13ac1b14 (diff)
downloadframeworks_base-996c5b93d6e8d5f3e5d5248e08a32f401ebfcb28.zip
frameworks_base-996c5b93d6e8d5f3e5d5248e08a32f401ebfcb28.tar.gz
frameworks_base-996c5b93d6e8d5f3e5d5248e08a32f401ebfcb28.tar.bz2
Merge tag 'android-6.0.1_r74' into HEAD
CYNGNOS-3303 Android 6.0.1 release 74
Diffstat (limited to 'core/java/android/util/TimeUtils.java')
0 files changed, 0 insertions, 0 deletions