summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2015-07-08 22:01:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-08 22:01:32 +0000
commit46552cfff17d2ca57811e2216dc03a323dcded49 (patch)
tree73740c0d3f8e6aebf4304befabedef5758e839fa /tools/aapt2/java/JavaClassGenerator_test.cpp
parent612aac4e50700ee5ab116318e0475080b2764e4d (diff)
parent9d587a97b9cf89f85d1782a6af66bff487568945 (diff)
am 9d587a97: Merge changes I9971c466,Ib42474fd into mnc-dev
* commit '9d587a97b9cf89f85d1782a6af66bff487568945': Kill MediaProvider during drastic changes. Use best volume description for MTP.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions