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