OSDN Git Service

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

Change-Id: I8f815f47108943f4fe9d6254b86f18b59b667779


Trivial merge