tree ad7e564e86eb419a0472016c3f8c947a640cb2a7
parent d1d074326d81b6a92cff5a5fc279b8c9177cc7aa
parent b4ac65594bf0e29acf1d9a81298d1a747f318059
author Justin Ho <justinho@google.com> 1316545753 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1316545753 -0700

Merge "Updated lockscreen camera assets Bug: 5296921" into ics-factoryrom