tree a8b2360b711f281cef898cbabaad284ade722538
parent ccd5aeef0bccfa7963a3dc5d33d467a1446865f1
parent 6a5030748a0f18f58bb87dbb95d82f2eae395583
author John Wang <johnwang@google.com> 1264183703 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1264183703 -0800

Merge "Update carrier display in lockscreen." into eclair