diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-08-20 02:45:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 02:45:56 +0000 |
| commit | f13a24fa464a3d5a7253fddb67d8a31a94f37682 (patch) | |
| tree | 3781a6b2533a2206ef317431900a3b011a685241 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0eb6586beff3974361257e22ca421ba5fb25b19b (diff) | |
| parent | b7421d5438f014f501691076cf86ac654798e6bf (diff) | |
am b7421d54: am e30df6fc: am 7de9fbca: am 2364af20: Merge "Save interactive/screen-on state in KeyguardServiceDelegate" into mnc-dr-dev
* commit 'b7421d5438f014f501691076cf86ac654798e6bf':
Save interactive/screen-on state in KeyguardServiceDelegate
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions