tree de5d7b988d82e6eb424a42468f09443c1628a60d
parent 2b2d6f5e590671b10226bdb4cfd5d45b921474c2
parent 6ac646dea33978692de2eaf260ab61274163839d
author Android Build Merger (Role) <android-build-merger@google.com> 1497984710 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1497984719 +0000

Merge "Merge "remove the lock-use for prunePrintService in case blocking main thread" into oc-dev am: c06746ce46  -s ours am: e4e1c11e8b  -s ours" into oc-dr1-dev-plus-aosp