Dan Albert 181f731f9d am 167efbdf: Merge "resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp
* commit '167efbdfcf22143c7383091ba46d59bea9921e0d':
  Use char16_t for char things.
2014-09-09 15:02:57 +00:00
..