summaryrefslogtreecommitdiff
path: root/tools/aapt/Resource.cpp
diff options
context:
space:
mode:
author ztenghui <ztenghui@google.com> 2014-12-16 17:56:51 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-12-16 17:56:51 +0000
commit8a23b3820d6f4d08b6b6ca3ffb0f85bd829f5e97 (patch)
tree919d3a6b04eceaae2b5eae20e0173370d2b480bb /tools/aapt/Resource.cpp
parent7ea97e28e6a2271fd4d60c07b4fa83e019e3474a (diff)
parent84c7ef8a28d321e190d4d3f9a0c91ee5ae41bf9a (diff)
am 84c7ef8a: am d8ce65c9: Merge "Remove 2 sub-tests from the internal test app." into lmp-mr1-dev
* commit '84c7ef8a28d321e190d4d3f9a0c91ee5ae41bf9a': Remove 2 sub-tests from the internal test app.
Diffstat (limited to 'tools/aapt/Resource.cpp')
0 files changed, 0 insertions, 0 deletions