| commit | 8134b836cc638c28194494e9ae3bd7648f1d2555 | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Fri Jul 21 18:40:35 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 21 18:40:35 2017 +0000 |
| tree | bc1faa8eab3a497a6f8fcfcf370de6cef15ed22a | |
| parent | 8d2396cbbee6f7f5e5ff0a4bf44b7ce3fd4723ab [diff] | |
| parent | 11a134083abfa63cc657e8554820624976e68c57 [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 Change-Id: I43fd7479768d9b36e8f7c7719386b97336049983