Commit 1b4f0afa authored by Xin Li's avatar Xin Li
Browse files

Merge lollipop-mr1-cts-dev revision 915fdb6a 

into marshmallow-cts-dev.

BUG: 35224217
Change-Id: I2f028baa700a9ab70d1efb6ebbaf53f435004865
parents 74e801ae 915fdb6a
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