| commit | af63ced796a91123f9730897c58669783c7c4477 | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Thu Aug 31 14:54:15 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 31 14:54:15 2017 +0000 |
| tree | 2c234100835c18241432c09e05300e100c680791 | |
| parent | e08d267eeca540858c8457a973288e118bdb65b4 [diff] | |
| parent | 7e0e6e904cb0d0bcf4d41ed3c5f941eb2236852b [diff] |
Merge "Clear pending activity options when retrieved in ActivityManagerService." into oc-mr1-dev am: 7e0e6e904c Change-Id: I4d8c8ee58d8d1618ea39342dca0434e6a286fc1b