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:31:10 +0000 (21:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 21:31:10 +0000 (21:31 +0000)
commitd986ba26598cc0a2375d64a2dc60c0bf4ea415a7
tree3ecaef6bcf4c01ee7deccb634b153f66a42f89ed
parent0fab155cf861ee12e8b01b6339ef56524d56ebe1
parentf09a2ff2e627356cf44352b49e156e261dd049ba
Merge \"DO NOT MERGE: push out fix for data dir.\" into marshmallow-cts-dev
am: f09a2ff2e6  -s ours

Change-Id: Icdb05b897a4877b86581b41d1dd7d1a14031172b