Skip to content
Commit 5bb0b520 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [20124955, 20131744] into tm-qpr1-release. 

Change-Id: I41e61a03e8b7712cb057dbdc4818fed96e496c5c
parents 852b53cc 2b99c7ab
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