Julia Reynolds 48d51c9cfd Merge "Merge "Don't allow foreground notis to be blocked inline." into pi-dev am: 874b009137" into pi-dev-plus-aosp ...

am: 3fa676bb7e

Change-Id: I9e669848d7f04bd9a14aab048bbfd8734efb78c4

2018-03-10 01:32:46 +00:00

..

res/layout

…

src/com/android

Merge "Merge "Don't allow foreground notis to be blocked inline." into pi-dev am: 874b009137" into pi-dev-plus-aosp

2018-03-10 01:32:46 +00:00

Android.mk

frameworks/base: Set LOCAL_SDK_VERSION where possible.

2018-03-07 11:42:04 +00:00

AndroidManifest.xml

Switch to inline mockito for a bunch of tests

2018-02-18 13:02:25 -05:00

AndroidTest.xml

Update Several Instrumentation AndroidTest files with the correct runner.

2017-08-31 14:04:56 -07:00