Commits
Dmitri Plotnikov authored and Android Git Automerger committed 68b4480961cM
am c1ddb155: am 483a599c: Merge change 25954 into eclair Merge commit 'c1ddb155b86a916b5e0c712493949c582ab495c2' * commit 'c1ddb155b86a916b5e0c712493949c582ab495c2': Moving DISPLAY_NAME to column "data1" to keep it "aligned" with other data types.
Showing diff to98890a2d31e