tree 1151d7a901ed3082a75bbcf2d0a22cc9f9e3a501
parent 50ecd02a2c38f6b338cf6b47767689d5f3d3284a
parent 91d15b83c31b8ce494905e478085a1ce0912665a
author Brad Stenning <stenning@google.com> 1524612664 -0700
committer android-build-merger <android-build-merger@google.com> 1524612664 -0700

Merge "Allow for the lock screen to have a different set of nav buttons" into pi-dev am: bdf8770ae3
am: 91d15b83c3

Change-Id: Ib3cf2b1160111805c45f2211536a2f4edc5f5560