| commit | 7e0e6e904cb0d0bcf4d41ed3c5f941eb2236852b | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Thu Aug 31 14:43:02 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 31 14:43:02 2017 +0000 |
| tree | 76f2206b7d981955f0b27ef57678baf7b0767a88 | |
| parent | 83d0cd221f8e6dd08589c49757bdb6f07effadf5 [diff] | |
| parent | c7f4330457e904cbec3ff7dac15aa5a7cf1ab242 [diff] |
Merge "Clear pending activity options when retrieved in ActivityManagerService." into oc-mr1-dev