am 2333a02e: (-s ours) Merge "Convert the outer lockscreen ring to a shape...
am 2333a02e: (-s ours) Merge "Convert the outer lockscreen ring to a shape drawable. DO NOT MERGE" into ics-mr1
* commit '2333a02e':
Convert the outer lockscreen ring to a shape drawable. DO NOT MERGE