OSDN Git Service

Merge "Merge \\\\\\\"DO NOT MERGE: push out fix for data dir.\\\\\\\" into marshmallo...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 22 Jun 2016 21:46:30 +0000 (21:46 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 22 Jun 2016 21:46:30 +0000 (21:46 +0000)

Trivial merge