Rahul Sabnis 87dd39f1bc Merge "Revert "Re-add getAliasName to fix build breakage"" ...

am: 944fed6b66

Change-Id: Id9a95b707b14ea11b24504b423bc936bb0f18ced

2019-11-19 15:34:01 -08:00

..

java

Merge "Revert "Re-add getAliasName to fix build breakage""

2019-11-19 15:34:01 -08:00

jni

Merge "Frameworks/base: Support dex2oat cpu-set system property"

2019-11-19 15:19:37 -08:00

proto

Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master

2019-10-31 18:38:40 +00:00

res

Merge "Mark strings with incorrect contents as deprecated"

2019-11-18 13:56:20 -08:00

tests

Merge changes from topic "apex_migration"

2019-11-06 18:30:09 -08:00

xsd

…