Adrian Roos 2d81d157a9 Merge "FRP: clear FRP when setup complete if not set up" into oc-mr1-dev am: 3d558d8dd8 ...

am: 8eecb09d40

Change-Id: Ic5f283ab6958d71869c4e98d4cd934438a0d73b8

2017-08-11 12:33:58 +00:00

..

java/com/android/server

Merge "FRP: clear FRP when setup complete if not set up" into oc-mr1-dev am: 3d558d8dd8

2017-08-11 12:33:58 +00:00

jni

Merge "Pass ProgramInfo over currentProgramInfoChanged and drop afSwitch_1_1." into oc-mr1-dev

2017-08-05 20:59:17 +00:00

Android.mk

services.core: remove use of -static hidl java

2017-08-03 15:19:03 -07:00