Malcolm Chen 2bac68a635 Merge "Move Ims related settings from global setting to subscription db." am: f2ebbd1356 ...

am: 5bf5c028f7

Change-Id: Iab3a7a47da5961471bce7a8e29960ab75e68719b

2018-01-03 20:04:37 +00:00

..

java

Merge "Move Ims related settings from global setting to subscription db." am: f2ebbd1356

2018-01-03 20:04:37 +00:00

jni

Merge "Fix temporary file name strlcpy size." am: d4d542e0ca

2017-12-28 18:06:15 +00:00

proto/android

Add persistent state for Hearing Aid Profile

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

res

Import translations. DO NOT MERGE

2017-12-20 17:23:17 -08:00

tests

Merge "Don't include mockito in frameworks-base-testutils" am: f924642729

2017-12-20 19:18:45 +00:00