| commit | 084065263503d2955a6b82bc5080884c355878e2 | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Thu Aug 31 15:05:24 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 31 15:05:24 2017 +0000 |
| tree | 596b788e8c0be292d7cafa989579318509123ac7 | |
| parent | 4b950cf674c7215de3c7ab650c9eb7c82fb47569 [diff] | |
| parent | af63ced796a91123f9730897c58669783c7c4477 [diff] |
Merge "Clear pending activity options when retrieved in ActivityManagerService." into oc-mr1-dev am: 7e0e6e904c am: af63ced796 Change-Id: Ied784c5b0b20aca02780f6b6bb8d221d367cf279