diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-22 21:02:25 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-22 21:02:25 +0000 |
commit | 0d78b1644a7ca20ccec1201bc748d01be6a7ebd1 (patch) | |
tree | 02ccc4dfd2c5bc4fbae44624910e4bc9fbf16ad3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 6a8d1fd62f73a241e7962b3baa3720a6dcd0767b (diff) | |
parent | 2c08546afb01c938e3778a155488b15e326703f1 (diff) |
am 2c08546a: am d2b597d1: Merge "Enforce a timeout for Content Providers to be published." into mnc-dr-dev
* commit '2c08546afb01c938e3778a155488b15e326703f1':
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