OSDN Git Service

am a6389a9c: Merge "Updated codelock assets" into ics-mr0
authorJustin Ho <justinho@google.com>
Mon, 17 Oct 2011 14:07:14 +0000 (07:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Oct 2011 14:07:14 +0000 (07:07 -0700)
* commit 'a6389a9c1e1a50fe040961dfead76102b530b149':
  Updated codelock assets


Trivial merge