Commit c0742c14 authored by The Android Automerger's avatar The Android Automerger Committed by Android Git Automerger
Browse files

am 68809163: merge in master-release history after reset to... 

am 68809163: merge in master-release history after reset to 5a20108b

* commit '68809163':
  Test MediaPlayer.release() with blocked network
  Change expectations for high precision doubles.
  Mark classes of tests for bionic known failures.
  Don't NPE when no security message is provided.
  Test proper detection of character set encodings
parents 342e4ddc 68809163
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment