Commit 3593c2fa authored by Daniel Xie's avatar Daniel Xie Committed by android-build-merger
Browse files

Merge \\\\\"DO NOT MERGE: push out fix for data dir.\\\\\" into... 

Merge \\\\\"DO NOT MERGE: push out fix for data dir.\\\\\" into marshmallow-cts-dev am: f09a2ff2  -s ours am: d986ba26 am: 99a49f54 am: 9ced3475
am: e8be35da  -s ours

Change-Id: I177ca0c55de3b54bd764f6eddf8749325b6cb3f4
parents 378eb66e e8be35da
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