diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-22 21:11:30 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-22 21:11:30 +0000 |
commit | 64c71b72ad0e56d64e72af4147231b7fe8f796ee (patch) | |
tree | 430e0b064fbc7e71023267c88fe95e37bab8f0ec /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 112c1dc63adbc36b1bd50dac24d1ea39959ef0f2 (diff) | |
parent | 0d78b1644a7ca20ccec1201bc748d01be6a7ebd1 (diff) |
am 0d78b164: am 2c08546a: am d2b597d1: Merge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev
* commit '0d78b1644a7ca20ccec1201bc748d01be6a7ebd1':
Enforce a timeout for Content Providers to be published.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions