| commit | 9ad33d2fc46805badf8496138ae4a9a8b2706ace | [log] [tgz] |
|---|---|---|
| author | Annie Meng <anniemeng@google.com> | Tue May 29 10:57:06 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 29 10:57:06 2018 -0700 |
| tree | 921596daf4088a7f915d0fa1b7d963b825fb22bd | |
| parent | a52c09e8dbd299789a0ed93054a97af51fa61b8b [diff] | |
| parent | 9750d81f9a20ccd9eaed5d0d66744465e58bce05 [diff] |
[automerger skipped] Merge "[automerger skipped] Merge "[DO NOT MERGE] Fix BackupRestoreHostSideTest on M" into marshmallow-cts-dev am: 4e3f64e3a2 -s ours" into nougat-cts-dev am: 6d22cff5da -s ours skipped: 78aaed6dd6 skipped: ca7c886b97 skipped: 27b70 skipped: 23e8fad855 am: 3b4684ba42 am: 1cb10498c4 am: 9750d81f9a -s ours Change-Id: I5b95be6baff490c093882ae665ac6ebe3af8b1c8