commit | 183455b02aa802353dea89b7277ccd74d561d54e | [log] [tgz] |
---|---|---|
author | Jorim Jaggi <jjaggi@google.com> | Wed Nov 05 18:47:45 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 05 18:47:45 2014 +0000 |
tree | b112e299317692586fadfbafe20c2a0262322265 | |
parent | 5bc105f0e6d6b8b01a370c5e4fa24c57ee57ee31 [diff] | |
parent | 80ae285010f0113c663ba06e66108472c57f5883 [diff] |
am 80ae2850: Merge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev automerge: 09ba32c automerge: 80a28fe * commit '80ae285010f0113c663ba06e66108472c57f5883': Fix janky in transition doze -> lockscreen