Merge commit '483a599c0330da087502b5b75bbe82fe8236cbec' into eclair-plus-aosp * commit '483a599c0330da087502b5b75bbe82fe8236cbec': Moving DISPLAY_NAME to column "data1" to keep it "aligned" with other data types.
Merge commit '483a599c0330da087502b5b75bbe82fe8236cbec' into eclair-plus-aosp * commit '483a599c0330da087502b5b75bbe82fe8236cbec': Moving DISPLAY_NAME to column "data1" to keep it "aligned" with other data types.