OSDN Git Service

am b5746cb1: Merge "[LockSettings] pipe through HW throttle timeout" into mnc-dev
authorAndres Morales <anmorales@google.com>
Wed, 27 May 2015 20:23:42 +0000 (20:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 May 2015 20:23:42 +0000 (20:23 +0000)
* commit 'b5746cb19bef50036eae2353714bc50ff491ba68':
  [LockSettings] pipe through HW throttle timeout


Trivial merge