David Brazdil 77ba6baab5 Merge "Pass targetSdkVersion to installd" ...

am: 106a915256

Change-Id: If9622d593591a4a270e0bb1a16ed3a0c91d43f43

2018-01-17 14:10:54 +00:00

..

java

Merge "Pass targetSdkVersion to installd"

2018-01-17 14:10:54 +00:00

jni

Merge "android.os.VintfObject: update for VNDK version format change."

2018-01-12 22:12:39 +00:00

proto/android

Add persistent state for Hearing Aid Profile

2017-11-28 07:27:29 +00:00

res

Merge "Add new config for number of physical SIM slots on the device."

2018-01-11 22:43:10 +00:00

tests

Merge "Move more core networking tests to framework/base/tests/net."

2018-01-11 03:09:40 +00:00