diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-03-23 20:01:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-23 20:01:13 +0000 |
| commit | 346a71da4c9c79fbf9e45257f5df1306ba243b25 (patch) | |
| tree | ba478095939a0624f8326df95288002cb357281a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 133e6cfef0b4ce2c0bf0c2e0f7eda6662f585938 (diff) | |
| parent | 23e9e5373c09f6c313400f32d92ca47fd4f1225f (diff) | |
Merge changes from topic "change-13630081" into sc-dev
* changes:
Revert^2 "Remove final calls to Dependency.get from keyguard."
Revert^2 "Remove Dependency.get from KeyguardStatusView."
Revert^2 "Add injection to ClockProvider."
Revert^2 "Remove Dependency.get from KeyguardSliceTextView."
Revert^2 "Add Controller for Emergency Button."
Revert^2 "Add ViewController to CarrierText."
Create central TelephonyListenerManager.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions