OSDN Git Service

Merge "AOD: Fix wakeAndUnlockPulsing transition" into oc-dev
authorAdrian Roos <roosa@google.com>
Wed, 24 May 2017 22:01:34 +0000 (22:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 May 2017 22:01:34 +0000 (22:01 +0000)
commite90d58ed09b90b84f2f578839f0d4e2d9760f246
tree20a965c03f6e3bb2bcc3e7e535b991e803ed3d58
parent6bebfa708db1cbaf295c76f57f75ada2c5b38544
parent838e365581b8366c7e783c1448c8363cdf558c48
Merge "AOD: Fix wakeAndUnlockPulsing transition" into oc-dev
am: 838e365581

Change-Id: I7140eb9253c84dc35a5f3bf62576e71e4828c6c5