diff options
| author | Winson Chung <winsonc@google.com> | 2015-01-13 18:25:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-13 18:25:06 +0000 |
| commit | 2b59fb902eb1f7d65f4a2fcfdaa6ea603d6dd6f0 (patch) | |
| tree | 24023b3b5045aeb10f64978dcfc31f3177161245 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6478b4f19a527b0ca26485aaac477e4d4c83a5d5 (diff) | |
| parent | b1a0a57ccab94e479087b620dcea2b39225693bb (diff) | |
Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev automerge: 7ce662e -s ours
automerge: b1a0a57 -s ours
* commit 'b1a0a57ccab94e479087b620dcea2b39225693bb':
DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions