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)
commit294cbf26c2d31468ee1c3283baa129099c286890
treea8c4ee2be5c921805aa46d4345be6ae1217d23ca
parent59a7f49d94039d9615576b1df587628d8c576208
parent4a4dd4976cd1fb4b2aa1b63b3ce06e67b2487f69
Merge "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" into nyc-mr1-dev-plus-aosp