summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2015-09-22 21:25:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-22 21:25:24 +0000
commit622b2b7ce28d73bc6084d2f6e67de986be84b93e (patch)
tree035033a7fc4834fe2e3b04633336db85915eaee9 /tools/aapt2/java/JavaClassGenerator.cpp
parent7c7ad1a204ee19dfec54d348f5a1ad1730b6c572 (diff)
parent64c71b72ad0e56d64e72af4147231b7fe8f796ee (diff)
am 64c71b72: am 0d78b164: am 2c08546a: am d2b597d1: Merge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev
* commit '64c71b72ad0e56d64e72af4147231b7fe8f796ee': Enforce a timeout for Content Providers to be published.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions