Brett Chabot 0a4ceee14e resolve merge conflicts of 18900c462c to stage-aosp-master ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I8ad986d06195bcd2861023e943c4ea7d0e2be729
Merged-In: Ib04d80954bd8536914d88c66b28e6632e60a6245

2019-03-01 22:18:04 +00:00

..

res/layout

…

src/com/android

resolve merge conflicts of 18900c462c to stage-aosp-master

2019-03-01 22:18:04 +00:00

Android.mk

Migrate frameworks/base/tests/testables and its users to androidx.test

2019-03-01 17:23:42 +00:00

AndroidManifest.xml

Merge "DO NOT MERGE Implement USB High Temperature warning dialog(1/N)" into pi-dev

2018-12-09 18:14:56 -08:00

AndroidTest.xml

Exempt tests for hidden APIs.

2018-04-06 14:54:39 +01:00