OSDN Git Service

Merge "Do not clear recent intrusive flag if still intrusive" into oc-dev
authorJulia Reynolds <juliacr@google.com>
Thu, 4 May 2017 21:06:22 +0000 (21:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 May 2017 21:06:22 +0000 (21:06 +0000)
commit6f9b09837150e6dc75446affaa1c38c09130abd4
tree439c0d8706c9e0a58d809f3f4e4952b8f703dce3
parent8c0f813e4b667cd5f8f046e88d24ba4799459e7a
parent180f0174ff271c15233b2b1f1e760e4083a52240
Merge "Do not clear recent intrusive flag if still intrusive" into oc-dev
am: 180f0174ff

Change-Id: Ia13f2ac9ddb54799778c617bed0d98cab4c24cea