Andreas Gampe 75dc3e9cf4 Merge "Frameworks: Move SharedPreferencesImpl to tristate" ...

am: 5edae415b0

Change-Id: Idef313e1a0c1a69434783da2441a84aa6e12409e

2018-01-12 02:32:15 +00:00

..

java

Merge "Frameworks: Move SharedPreferencesImpl to tristate"

2018-01-12 02:32:15 +00:00

jni

Merge "Revert "Move zygote's seccomp setup to post-fork""

2018-01-10 18:46:36 +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