From: Charles He <qiurui@google.com>
Date: Thu, 2 Nov 2017 10:58:30 +0000 (+0000)
Subject: Merge "TokenWatcher: fix bug in repeated calls to acquire()." am: dfe472ecae
X-Git-Tag: android-x86-9.0-r1~335^2~2^2~18
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4e701561d3fc2839ee1f53fbb4ed215b7edcfbd5;p=android-x86%2Fframeworks-base.git

Merge "TokenWatcher: fix bug in repeated calls to acquire()." am: dfe472ecae
am: c214d506d4

Change-Id: I0760ba5c839af8a9dd4b9161dbbad16eacdb3550
---

4e701561d3fc2839ee1f53fbb4ed215b7edcfbd5