Lockscreen shortcuts: fix indention
Parse UUID string with Long.parseLong

Integer.parseInt throws an NPE for values greater than 0x7fffffff.
Merge branch 'kk-ras-mr1.2' of https://github.com/rascarlo/android_frameworks_base into kk