commit | d986ba26598cc0a2375d64a2dc60c0bf4ea415a7 | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Wed Jun 22 21:31:10 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 22 21:31:10 2016 +0000 |
tree | 3ecaef6bcf4c01ee7deccb634b153f66a42f89ed | |
parent | 0fab155cf861ee12e8b01b6339ef56524d56ebe1 [diff] | |
parent | f09a2ff2e627356cf44352b49e156e261dd049ba [diff] |
Merge \"DO NOT MERGE: push out fix for data dir.\" into marshmallow-cts-dev am: f09a2ff2e6 -s ours Change-Id: Icdb05b897a4877b86581b41d1dd7d1a14031172b