OSDN Git Service

Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev am: 6cea122bfc am: 207bb2947e
authorFan Zhang <zhfan@google.com>
Fri, 7 Oct 2016 18:24:41 +0000 (18:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Oct 2016 18:24:41 +0000 (18:24 +0000)
commit79ff72adc8e0a8b86cb81cf7848669cca378e267
tree206b0849d1c0ee298e1dc06b8ec96c508d9af347
parent9f9e42d0f98eada888b0ecff657de7d74c42bc9a
parent6b72c17434fa4d243659bc2c1fed201bccba3152
Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev am: 6cea122bfc am: 207bb2947e
am: 6b72c17434

Change-Id: I8ab6ad5ace2b737bfb9e68cc350aa45dbc836d01