Felipe Leme 46475e4028 Merge "Clarified usage of onDetach() and onCreate() when setRetainInstance() is set to true. BUG: 25455734"

2015-11-05 02:19:06 +00:00

..

java

Merge "Clarified usage of onDetach() and onCreate() when setRetainInstance() is set to true. BUG: 25455734"

2015-11-05 02:19:06 +00:00

jni

Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6 am: 95fc53b029 am: d6f3e38738

2015-11-03 23:34:54 +00:00

res

Import translations. DO NOT MERGE

2015-11-04 11:40:21 -06:00

tests

Merge "Fix failing TextActivityTest."

2015-11-03 16:06:38 +00:00