Commit 99a49f54 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 marshmallow-cts-dev... 

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

Change-Id: I670ae33ee552d13a25f1071ce042015baf470e22
parents 930bdf8e d986ba26
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