diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-11-26 18:43:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 18:43:47 +0000 |
| commit | f1e6d2315eea6e9f289b8c1bafc04a4cbc6f05e1 (patch) | |
| tree | fa7172b5c70e6b65c8eaca69b58186288507c49b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 63aa80f6edadac1eaf245333f4762832d4cd0937 (diff) | |
| parent | c5c2e53779c2c2b6d889bdad5d11d47da9e72789 (diff) | |
am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev
* commit 'c5c2e53779c2c2b6d889bdad5d11d47da9e72789':
Make IKeyguardService interface asynchronous
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions