Erik Kline 36712853a9 Merge "Make public the registerDefaultNetworkCallback API" into nyc-dev

2016-04-06 08:51:08 +00:00

..

java

Merge "Make public the registerDefaultNetworkCallback API" into nyc-dev

2016-04-06 08:51:08 +00:00

jni

Downgrades error messages about not being able to detect whether we are in protected mode or not to informational messages. If there is no GL context, then we are by definition not in protected mode, and still return false as advertised, thus there's no need for an error message.

2016-04-05 15:18:34 -07:00

res

Merge "Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two." into nyc-dev

2016-04-05 14:52:02 +00:00

tests

Merge "Make FastXmlSerializer more suitable to persist arbitrary strings" into nyc-dev

2016-04-06 00:36:52 +00:00