OSDN Git Service

Set disable timer in case of any active ACL connection am: 3e4f01ada8
authorSrinu Jella <sjella@codeaurora.org>
Wed, 8 Jun 2016 19:15:52 +0000 (19:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Jun 2016 19:15:52 +0000 (19:15 +0000)
am: b5d0d36154

Change-Id: I968db4a71934e298d91e8e3815c21d697157efb9


Trivial merge