summaryrefslogtreecommitdiffstats
path: root/core/java/android/database
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2015-01-08 01:11:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-08 01:11:05 +0000
commit6fe380724b0c30784caaadd33e8fbe94d58cab6e (patch)
tree715d3b6cbaa56a986561d2b3c4ca2d308545a285 /core/java/android/database
parent4456b81f22b67d124b85e1a7b1a15a877b604e8b (diff)
parentbcba21827c836e8941719b432fbf11d1bb8e8639 (diff)
downloadframeworks_base-6fe380724b0c30784caaadd33e8fbe94d58cab6e.zip
frameworks_base-6fe380724b0c30784caaadd33e8fbe94d58cab6e.tar.gz
frameworks_base-6fe380724b0c30784caaadd33e8fbe94d58cab6e.tar.bz2
am bcba2182: Merge "check ntpserver as empty string instead of null" automerge: dbcb4a1 automerge: 387da77
* commit 'bcba21827c836e8941719b432fbf11d1bb8e8639': check ntpserver as empty string instead of null
Diffstat (limited to 'core/java/android/database')
0 files changed, 0 insertions, 0 deletions