diff options
| author | Baligh Uddin <baligh@google.com> | 2016-11-22 17:19:45 -0800 |
|---|---|---|
| committer | Baligh Uddin <baligh@google.com> | 2016-11-22 17:19:45 -0800 |
| commit | b1df48d32632d0ba5a2389fb9fad2943dcb55562 (patch) | |
| tree | 7a1135a5911de2bbaa7bb6a4954fbcca71b71632 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 201cf4fb27a42237cc70fba44f05195e6a38e4cb (diff) | |
| parent | 466bb400bbc7a249f6598d8dc24ac685a43df74d (diff) | |
Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger
Bug: 32849428
* goog/cw-f-dev: (98 commits)
Revert "Catch KeyStoreException for setting profile lock"
Fix createConfirmDeviceCredentialIntent for wear for CTS.
Fix default dialog background colour for watch devices.
Catch KeyStoreException for setting profile lock
Add cross-links between FINE and COARSE location permissions. bug: 25371600
Fixed a bug with the emergency affordance in multi user
Zygote: Additional whitelists for runtime overlay / other static resources.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Zygote : Block SIGCHLD during fork.
colors: add missing accent_material_{700,50} resources.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Zygote : Block SIGCHLD during fork.
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"
...
Change-Id: I63468da5bfa21ed9ac5985bbdbf3a61d4c389aa0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions