tree 3ba1502102511547315ceb397a8842e835d00e9e
parent 65f57e4ceae5680b989e62e7cac502994781a1cd
parent 99a49f54173b28314e66ccfc1bef908a1808e9c4
author Daniel Xie <dxie@google.com> 1466631366 +0000
committer android-build-merger <android-build-merger@google.com> 1466631366 +0000

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

Change-Id: I60161d61084359f0ae74c2fdfd9e75b6af5b24d3