OSDN Git Service

am 6042133f: am b5746cb1: Merge "[LockSettings] pipe through HW throttle timeout...
authorAndres Morales <anmorales@google.com>
Wed, 27 May 2015 20:45:52 +0000 (20:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 May 2015 20:45:52 +0000 (20:45 +0000)
* commit '6042133f48b340b24babc8c590b874ddac9dfe6f':
  [LockSettings] pipe through HW throttle timeout


Trivial merge