0763a03d228ef66633cdea9872ffc08090f49974
0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev
* commit '0ae82b05be47df85551a1c759a93e84c8009947c': Docs: adding closing bracket to un-break javadoc tokens.
…
am
aeef612f: Merge "Search all packages for a given type string when looking up resources by name" into lmp-dev
am
6166a824: Merge "Implement issue #17906468: Allow search request to fall back to global search" into lmp-dev
…
am
c130b428: Merge "Ensure that the SIM language doesn\'t override the user language on the encryption UI." into lmp-dev
am
6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successfully on ART." into lmp-dev
am
f47f8855: Merge "Added a daemon mode to aapt to receive streams of commands from gradle." into lmp-dev
…
Description
No description provided
Languages
Java
73.7%
Kotlin
14%
PowerBuilder
5.8%
C++
5.2%
AIDL
1%