summaryrefslogtreecommitdiff
path: root/tools/aapt/StringPool.cpp
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@google.com> 2010-06-24 17:16:37 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-06-24 17:16:37 -0700
commit7acbc1f1e7778270d737b893581cfbb0e9d90e5c (patch)
tree8d7aea14f5e431b577dfbabc7b670473eee84cbb /tools/aapt/StringPool.cpp
parent36e5f667bc889a7b1bc17f9a5bd44f33b2d47020 (diff)
parentcac3126c6109854640266c4807e5aa8e6a87142f (diff)
am cac3126c: am 5340bffd: am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo
Merge commit 'cac3126c6109854640266c4807e5aa8e6a87142f' * commit 'cac3126c6109854640266c4807e5aa8e6a87142f': Properly note the current active restore set's token
Diffstat (limited to 'tools/aapt/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions