summaryrefslogtreecommitdiff
path: root/libs/hwui/ResourceCache.cpp
diff options
context:
space:
mode:
author Nick Pelly <npelly@google.com> 2010-10-18 15:23:17 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-18 15:23:17 -0700
commit7dced8de3813aa42edb59e13e3ea3a2657d06125 (patch)
treee700aac320a293b7516c34c0ab5590a7bb9ea0c0 /libs/hwui/ResourceCache.cpp
parent38476ef2f1bc5d8c3540382ea792f709d0b61faf (diff)
parent2b51fcb9ac80c7c42be8f53763773414ba9ca4fa (diff)
am 2b51fcb9: Merge "NFC: broadcast intent constants for adapter state change" into gingerbread
Merge commit '2b51fcb9ac80c7c42be8f53763773414ba9ca4fa' into gingerbread-plus-aosp * commit '2b51fcb9ac80c7c42be8f53763773414ba9ca4fa': NFC: broadcast intent constants for adapter state change
Diffstat (limited to 'libs/hwui/ResourceCache.cpp')
0 files changed, 0 insertions, 0 deletions