diff options
author | Ronghua Wu <ronghuawu@google.com> | 2015-07-01 04:00:20 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-01 04:00:23 +0000 |
commit | e0b71b4ef7af0a8e49341ba65eaf61981845e713 (patch) | |
tree | da0a818554a0e0f9abd41801c922b56eb31aca7e /core/java/android/util/TimeUtils.java | |
parent | 22233b51c3c3e678571dbe5e6d1035b7e1440408 (diff) | |
parent | 71b5a5866d8ba0eaf45972741b8f1dece36b5d03 (diff) | |
download | frameworks_base-e0b71b4ef7af0a8e49341ba65eaf61981845e713.zip frameworks_base-e0b71b4ef7af0a8e49341ba65eaf61981845e713.tar.gz frameworks_base-e0b71b4ef7af0a8e49341ba65eaf61981845e713.tar.bz2 |
Merge "media: clean up the usage of max-supported-instances." into mnc-dev
Diffstat (limited to 'core/java/android/util/TimeUtils.java')
0 files changed, 0 insertions, 0 deletions