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:38:36 +0000 (21:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 21:38:36 +0000 (21:38 +0000)
commite8be35da77bff7ab846f26294141b8a32d9dfdf4
tree3ba1502102511547315ceb397a8842e835d00e9e
parent6a0a02efabed025eabbf614698763c0691c7958b
parent9ced3475be2d3b2ce59b3c2a1103a0b935096dce
Merge \\\\"DO NOT MERGE: push out fix for data dir.\\\\" into marshmallow-cts-dev am: f09a2ff2e6  -s ours am: d986ba2659 am: 99a49f5417
am: 9ced3475be

Change-Id: Ie4afe19fe05d760ce22246fb98ef9f5a8a8a88d2