Skip to content
Commit 84b3fc11 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [20122571, 20130738] into tm-qpr1-release. 

Change-Id: I4708b83cd24fe2d12749af66a31bdf8777d753d3
parents 31aa22ce 9b794f6d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment