Neil Fuller 98f03f4980 Merge "Correctly handle when the user has no explicit time_12_24 setting" ...

am: 8631e19d38

Change-Id: I70533c5ff4ac8cdeef1b42337bb47b09c8bbf927

2016-11-15 16:50:29 +00:00

..

java

Merge "Correctly handle when the user has no explicit time_12_24 setting"

2016-11-15 16:50:29 +00:00

jni

Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods."

2016-11-15 03:06:44 +00:00

res

Merge "Add voip audio mode configuration for ims call"

2016-11-08 18:37:42 +00:00

tests

Merge "app_process: Forward -cp/-classpath to ART."

2016-10-28 17:48:15 +00:00