Andreas Gampe 19f1844e7e Merge "Framework: Ensure image heap string literals for Patterns" am: d0f092af84 am: 838851364b ...

am: 5fe3eb7696

Change-Id: Ia0bf25c740eedee436436e573241a59685db2fbd

2017-03-07 17:08:43 +00:00

..

java

Merge "Framework: Ensure image heap string literals for Patterns" am: d0f092af84 am: 838851364b

2017-03-07 17:08:43 +00:00

jni

Merge "Customizable minimum suffix/prefix length for hyphenation"

2017-03-07 01:46:03 +00:00

proto/android

Merge "Protobufferize PowerManager dumpsys"

2017-02-24 21:36:19 +00:00

res

Merge changes Iefcaf262,I9c397d83

2017-03-07 05:44:54 +00:00

tests

Merge "Add @LargeTest to (Secondary|Managed)UserContentResolverTest classes."

2017-03-06 22:45:40 +00:00