| commit | 76d19db2e4650ca4046056019b7e9db557a17b06 | [log] [tgz] |
|---|---|---|
| author | JW Wang <wangchun@google.com> | Fri Feb 07 14:36:33 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Feb 07 14:36:33 2020 +0000 |
| tree | b900ef0d3dbc0c9ccbe4ae27712f4a081fd68217 | |
| parent | cbeeff9e2e890982557b6a85e33eccb96d3ea921 [diff] | |
| parent | 1ac3d11862b73ca43f12e23741a89701f47c9faa [diff] |
Merge changes Ie95789c9,I3d800491,I31f6b981,Ia3a4116b,I7edd3cf7 * changes: Rewrite handling of failed sessions (2/n) Rewrite the broadcast receiver for ACTION_CANCEL_ENABLE_ROLLBACK (1/n) Remove #mNewRollbacks (10/n) Put rollbacks into #mRollbacks (9/n) Add a flag to facilitate merging 2 rollback collections (8/n)