DO NOT MERGE ANYWHERE: resolve merge conflicts of...
DO NOT MERGE ANYWHERE: resolve merge conflicts of 77c1f608 to oc-dr1-dev Bug: 111603898 Test: manual Change-Id: I5933f27f2fbd90a6de447fbf7f17063f6b7f1fb8
No related branches found
No related tags found
Showing
- core/java/com/android/internal/app/AssistUtils.java 29 additions, 2 deletionscore/java/com/android/internal/app/AssistUtils.java
- core/res/res/values/config.xml 4 additions, 0 deletionscore/res/res/values/config.xml
- core/res/res/values/symbols.xml 2 additions, 0 deletionscore/res/res/values/symbols.xml
Loading
Please register or sign in to comment