| commit | fdd04e84a209a970171c38e3514a09607c952f7d | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Fri Jul 21 18:58:38 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 21 18:58:38 2017 +0000 |
| tree | 7d893b1b027d35588a70415d603ce32886eb56b5 | |
| parent | 4fe88747fc5ea18baf20c097f0f362706b2b4912 [diff] | |
| parent | 8134b836cc638c28194494e9ae3bd7648f1d2555 [diff] |
Merge "Merge "Ensure backup doesn't reuse ack tokens nearby in time" into oc-dr1-dev am: 672f578fd1" into oc-dr1-dev-plus-aosp am: 11a134083a am: 8134b836cc Change-Id: Ifd76bf03097592dd959aee584955d4aa5b23eec0