Commit 76053e70 authored by Daniel Xie's avatar Daniel Xie
Browse files

resolve merge conflicts of 61764212 to lollipop-cts-dev. 

Change-Id: Iff66671cf8d1d92664c010d0e1a3a33f1eaf2f75
parents 97fa3a23 61764212
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