summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Ho <justinho@google.com>2011-10-17 17:23:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-17 17:23:15 -0700
commit47fa123d26a80a311427e6c6f6404299566da9a2 (patch)
tree8de446341394ffb7368802e27c0c0d840d8e8229
parent8dfdc901887e1e4daedbdaece49501afc4b084f9 (diff)
parent112e0f16ea13949783a8200a11f55bcff543232c (diff)
downloadframeworks_native-47fa123d26a80a311427e6c6f6404299566da9a2.zip
frameworks_native-47fa123d26a80a311427e6c6f6404299566da9a2.tar.gz
frameworks_native-47fa123d26a80a311427e6c6f6404299566da9a2.tar.bz2
am e95a1190: Merge "Update unlock halo asset" into ics-mr0
* commit 'e95a1190ff9e15ac0924cd7f294cf6a486e3119f': Update unlock halo asset
0 files changed, 0 insertions, 0 deletions