OSDN Git Service

Merge "More fixes for keyguard animations." into lmp-mr1-dev
authorCraig Mautner <cmautner@google.com>
Thu, 6 Nov 2014 21:34:25 +0000 (21:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Nov 2014 21:34:25 +0000 (21:34 +0000)
commit39f6be121627303d9c485832c4b730867151d9f8
treecae846f62d0d597ef611894e2157293384e26f32
parentc6c5c7d6db61fac9eb3c4637a6d9573a18e43f67
parent7b1b0f63bcb76585621e856ecc8c8b71450735ee
Merge "More fixes for keyguard animations." into lmp-mr1-dev
automerge: 7b1b0f6

* commit '7b1b0f63bcb76585621e856ecc8c8b71450735ee':
  More fixes for keyguard animations.