| commit | 9ced3475be2d3b2ce59b3c2a1103a0b935096dce | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Jun 22 21:36:06 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 22 21:36:06 2016 +0000 |
| tree | 3ba1502102511547315ceb397a8842e835d00e9e | |
| parent | 65f57e4ceae5680b989e62e7cac502994781a1cd [diff] | |
| parent | 99a49f54173b28314e66ccfc1bef908a1808e9c4 [diff] |
Merge \\\"DO NOT MERGE: push out fix for data dir.\\\" into marshmallow-cts-dev am: f09a2ff2e6 -s ours am: d986ba2659 am: 99a49f5417 Change-Id: I60161d61084359f0ae74c2fdfd9e75b6af5b24d3