OSDN Git Service

Merge "TokenWatcher: fix bug in repeated calls to acquire()." am: dfe472ecae
authorCharles He <qiurui@google.com>
Thu, 2 Nov 2017 10:58:30 +0000 (10:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Nov 2017 10:58:30 +0000 (10:58 +0000)
am: c214d506d4

Change-Id: I0760ba5c839af8a9dd4b9161dbbad16eacdb3550


Trivial merge