summaryrefslogtreecommitdiffstats
path: root/core/java/android/net/IpPrefix.java
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-10-29 17:13:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-29 17:13:38 +0000
commit64a1a901dcd9b3103cc63d5c20de9af6db9d1ada (patch)
tree7142728c6fd3640438c1aabd076ab83ff85a6f59 /core/java/android/net/IpPrefix.java
parent177f91d1ede0cef9fc6c7c29f163b78467c49f8c (diff)
parent87ce99ca7243e4556a6cfe9f42cc51531301e979 (diff)
downloadframeworks_base-64a1a901dcd9b3103cc63d5c20de9af6db9d1ada.zip
frameworks_base-64a1a901dcd9b3103cc63d5c20de9af6db9d1ada.tar.gz
frameworks_base-64a1a901dcd9b3103cc63d5c20de9af6db9d1ada.tar.bz2
am 87ce99ca: am ced7ebdb: Merge "Migrate off timeFormat12 and timeFormat24."
* commit '87ce99ca7243e4556a6cfe9f42cc51531301e979': Migrate off timeFormat12 and timeFormat24.
Diffstat (limited to 'core/java/android/net/IpPrefix.java')
0 files changed, 0 insertions, 0 deletions