Neil Fuller 9103632f9d Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d38 am: 98f03f4980 ...

am: ef34053f26

Change-Id: I3724485cc956b2d5a64a6e71f325181d5fdbcccf

2016-11-15 17:04:37 +00:00

..

java

Merge "Correctly handle when the user has no explicit time_12_24 setting" am: 8631e19d38 am: 98f03f4980

2016-11-15 17:04:37 +00:00

jni

Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." am: 8cc1343724 am: 2187dc5ca1

2016-11-15 03:19:19 +00:00

res

Merge "Import translations. DO NOT MERGE" into cw-f-dev

2016-11-11 19:18:10 +00:00

tests

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

2016-10-28 17:55:12 +00:00