Tom Taylor 4d220d4777 resolve merge conflicts of eafd58a to nyc-dev
am: a43c5c5f18

Change-Id: Ibcf2308553a68a8deaa05d15548d3eca67d4579a
2016-12-07 02:45:53 +00:00
Description
LineageOS Messaging app - base for default SMS handler
12 MiB
Languages
Java 97.6%
HTML 1.1%
C++ 0.8%
Shell 0.4%
Makefile 0.1%