| commit | 11a134083abfa63cc657e8554820624976e68c57 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Jul 21 18:29:42 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 21 18:29:42 2017 +0000 |
| tree | bdbaa86786e32c0df4b9c3e6fbd1ffeda23477ab | |
| parent | 88901bd0df37eeedfe7ece3bf4e8be4fe701fa77 [diff] | |
| parent | 48976a1731ad294475b56c7dbff1c41654053f79 [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