tree 3ba1502102511547315ceb397a8842e835d00e9e
parent 6a0a02efabed025eabbf614698763c0691c7958b
parent 9ced3475be2d3b2ce59b3c2a1103a0b935096dce
author Daniel Xie <dxie@google.com> 1466631516 +0000
committer android-build-merger <android-build-merger@google.com> 1466631516 +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

Change-Id: Ie4afe19fe05d760ce22246fb98ef9f5a8a8a88d2