OSDN Git Service

Merge "Also show attached windows during FLAG_SHOW_WHEN_LOCKED animations" into nyc...
authorJorim Jaggi <jjaggi@google.com>
Thu, 1 Sep 2016 05:30:14 +0000 (05:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Sep 2016 05:30:14 +0000 (05:30 +0000)
commit023ea2a3ae0b94dcc2f8e6ca4918cbd7ef16f474
tree48b2031672177e3cd0bf8eaa1cca5a9d1e4a1b60
parentd8f89315ac2d36a934b8e42ef214ea133d9c2390
parent95c1cbeb504f3cfaa203a3dc480b8fb469dbc6ac
Merge "Also show attached windows during FLAG_SHOW_WHEN_LOCKED animations" into nyc-mr1-dev
am: 95c1cbeb50

Change-Id: I62796ca217d3dd5fea8ec59ee4a2b57193708c76