Jim Miller f0db3158fb Merge \\"Enable fingerprint sensor navigation to invoke QuickSettings - rename \\"FP_NAV\\" to more generic \\"SYSTEM_NAVIGATION\\"\\" into nyc-mr1-dev am: 0520091641 ...

am: 0a7efa1e47

Change-Id: Id8de76d28e581f5a4fa448dd48dc33870d81b538

2016-06-23 00:25:06 +00:00

..

current.txt

Merge \\"Enable fingerprint sensor navigation to invoke QuickSettings - rename \\"FP_NAV\\" to more generic \\"SYSTEM_NAVIGATION\\"\\" into nyc-mr1-dev am: 0520091641

2016-06-23 00:25:06 +00:00

removed.txt

resolve merge conflicts of 0c26c32 to master

2016-06-03 15:00:10 -06:00

system-current.txt

Merge \\"Enable fingerprint sensor navigation to invoke QuickSettings - rename \\"FP_NAV\\" to more generic \\"SYSTEM_NAVIGATION\\"\\" into nyc-mr1-dev am: 0520091641

2016-06-23 00:25:06 +00:00

system-removed.txt

resolve merge conflicts of 0c26c32 to master

2016-06-03 15:00:10 -06:00

test-current.txt

Merge \\"Enable fingerprint sensor navigation to invoke QuickSettings - rename \\"FP_NAV\\" to more generic \\"SYSTEM_NAVIGATION\\"\\" into nyc-mr1-dev am: 0520091641

2016-06-23 00:25:06 +00:00

test-removed.txt

resolve merge conflicts of 0c26c32 to master

2016-06-03 15:00:10 -06:00