Commit bf1edc83 authored by Igor Murashkin's avatar Igor Murashkin
Browse files

android: Merge branch 'upstream-master' into master 

Updates to aac2fc97 in upstream.

Change-Id: Ic56ec9d83b5611e734dfdbebec7c3538388f5c82
parents 2f3177dd aac2fc97
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