Merge "Propagate the device name changing back to FP2" into staging/n/fp2
tree: 334fe60afdb054822c55df696ccf3a8aea9f6c23
  1. overlay/
  2. Android.mk
  3. device.mk