Commit fcd2976d authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 5fd3be46: (-s ours) Reconcile with jb-mr2-release - do not merge 

* commit '5fd3be46':
  ignore orientation change which can happen due to replica island
  FileSystemPermissionTest: Whitelist Mako char devices
  FileSystemPermissionTest: Whitelist Nakasi char devices
parents 6a6a2297 5fd3be46
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