Selim Cinek ac51be5b1c Merge "Deprecated the contentinfo and the number" into nyc-dev ...

am: 82404bc

* commit '82404bc0689aceb328a29fe17c277091ce793fa8':
  Deprecated the contentinfo and the number

Change-Id: I4ab5ddb1fa42221377d5603e89dfea84425344fe

2016-04-06 20:51:42 +00:00

..

java

Merge "Deprecated the contentinfo and the number" into nyc-dev

2016-04-06 20:51:42 +00:00

jni

Merge "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." into nyc-dev

2016-04-05 23:25:24 +00:00

res

Merge "Deprecated the contentinfo and the number" into nyc-dev

2016-04-06 20:51:42 +00:00

tests

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

2016-04-06 00:43:46 +00:00