tree 0c551189100db65321b02751292db74c12ec3921
parent 378eb66e6c83833f35aae1391bc176402403e043
parent e8be35da77bff7ab846f26294141b8a32d9dfdf4
author Daniel Xie <dxie@google.com> 1466631667 +0000
committer android-build-merger <android-build-merger@google.com> 1466631667 +0000

Merge \\\\\"DO NOT MERGE: push out fix for data dir.\\\\\" into marshmallow-cts-dev am: f09a2ff2e6  -s ours am: d986ba2659 am: 99a49f5417 am: 9ced3475be
am: e8be35da77  -s ours

Change-Id: I177ca0c55de3b54bd764f6eddf8749325b6cb3f4