OSDN Git Service

Merge \\\\\"DO NOT MERGE: push out fix for data dir.\\\\\" into marshmallow-cts-dev...
authorDaniel Xie <dxie@google.com>
Wed, 22 Jun 2016 21:41:07 +0000 (21:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 21:41:07 +0000 (21:41 +0000)
am: e8be35da77  -s ours

Change-Id: I177ca0c55de3b54bd764f6eddf8749325b6cb3f4


Trivial merge