summaryrefslogtreecommitdiffstats
path: root/tools/aapt/Resource.cpp
diff options
context:
space:
mode:
authorDan Sandler <dsandler@android.com>2014-11-05 19:59:19 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-11-05 19:59:19 +0000
commitc45d74f81283af6ffaa7e6fde1194e733f00b0f2 (patch)
tree77ff8a7fc8628d38ce54ef7e60c7f78efcf5b02f /tools/aapt/Resource.cpp
parent85ba0d929f4cd6651e5a288d5840b4ee5854e147 (diff)
parent125fb86ee0cc0e49d6847bed7a76829ad87c1312 (diff)
downloadframeworks_base-c45d74f81283af6ffaa7e6fde1194e733f00b0f2.zip
frameworks_base-c45d74f81283af6ffaa7e6fde1194e733f00b0f2.tar.gz
frameworks_base-c45d74f81283af6ffaa7e6fde1194e733f00b0f2.tar.bz2
am ac8dbdaf: Merge "Materialize default app icon." into lmp-mr1-dev
automerge: 125fb86 * commit '125fb86ee0cc0e49d6847bed7a76829ad87c1312': Materialize default app icon.
Diffstat (limited to 'tools/aapt/Resource.cpp')
0 files changed, 0 insertions, 0 deletions