From: Justin Ho <justinho@google.com>
Date: Mon, 17 Oct 2011 14:07:14 +0000 (-0700)
Subject: am a6389a9c: Merge "Updated codelock assets" into ics-mr0
X-Git-Tag: android-x86-4.4-r1~3570
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c7fe22196a60d10d5914ada39490a321e571507b;p=android-x86%2Fframeworks-native.git

am a6389a9c: Merge "Updated codelock assets" into ics-mr0

* commit 'a6389a9c1e1a50fe040961dfead76102b530b149':
  Updated codelock assets
---

c7fe22196a60d10d5914ada39490a321e571507b