tree 3ba1502102511547315ceb397a8842e835d00e9e
parent 930bdf8e8c5fb1f6d1e880d6635160b311f1aacb
parent d986ba26598cc0a2375d64a2dc60c0bf4ea415a7
author Daniel Xie <dxie@google.com> 1466631219 +0000
committer android-build-merger <android-build-merger@google.com> 1466631219 +0000

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

Change-Id: I670ae33ee552d13a25f1071ce042015baf470e22