summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorJinsuk Kim <jinsukkim@google.com>2015-01-20 23:54:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-20 23:54:47 +0000
commit0ae35a8a26be0c2be53e5d149aead4d5d32ad07f (patch)
treed8cae5e8e1acc62ad7ac2b44c56802b7142d6fa9 /telephony
parent0a5be32d7a70d510fcdda030bdb34e31ec22ebe0 (diff)
parent00959a56e5869fcb8d05399656fddc9da54e86dc (diff)
downloadframeworks_base-0ae35a8a26be0c2be53e5d149aead4d5d32ad07f.zip
frameworks_base-0ae35a8a26be0c2be53e5d149aead4d5d32ad07f.tar.gz
frameworks_base-0ae35a8a26be0c2be53e5d149aead4d5d32ad07f.tar.bz2
am 00959a56: am 054f2656: Merge "Mark TimeUnit as @SystemApi" into lmp-mr1-dev automerge: 375ae7b
* commit '00959a56e5869fcb8d05399656fddc9da54e86dc': Mark TimeUnit as @SystemApi
Diffstat (limited to 'telephony')
0 files changed, 0 insertions, 0 deletions