OSDN Git Service

Merge "Update unlock halo asset" into ics-mr0
authorJustin Ho <justinho@google.com>
Tue, 18 Oct 2011 00:21:47 +0000 (17:21 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 18 Oct 2011 00:21:47 +0000 (17:21 -0700)
commit112e0f16ea13949783a8200a11f55bcff543232c
treee0ab5e53d8a9ea8a4b54fad86a6782af77202666
parent0609c4108d7424cc09ff3705ef5bcf98bf5969c9
parente9800c83114988b6f8cc25bb9d508ebb322f9903
Merge "Update unlock halo asset" into ics-mr0