tree ac2d4cd3292f4f51b5802b61cdef8d83aee61044
parent 5569abc0f606c4cecd1e43defe4c9df83b6545b5
parent e93d1b4ed9257530271817e53dfdb67366b6f056
author Jim Miller <jaggies@google.com> 1351902821 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1351902821 -0700

Merge "Clean up separator string in keyguard view" into jb-mr1-lockscreen-dev