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)
commit4a4dd4976cd1fb4b2aa1b63b3ce06e67b2487f69
treea8c4ee2be5c921805aa46d4345be6ae1217d23ca
parenteb8d7b8cf9f2821d025b4b254566855e37b825b2
parentbec2d19a54b9607facf6a106b4e809d0a218c947
Merge \\\\\\\"DO NOT MERGE: push out fix for data dir.\\\\\\\" into marshmallow-cts-dev am: f09a2ff2e6  -s ours am: d986ba2659 am: 99a49f5417 am: 9ced3475be am: e8be35da77  -s ours am: 3593c2fa62
am: bec2d19a54

Change-Id: I8f815f47108943f4fe9d6254b86f18b59b667779