tree 5618f6c181f4685b721fb141b59dfbbd691ce12b
parent 795f789c6a52503812c3af2178ea7b63779250e9
parent b67fa5bcfdabb8c8e2f35e8bcd27b72c9ef60456
author Dan Willemsen <dwillemsen@google.com> 1454977185 -0800
committer Dan Willemsen <dwillemsen@google.com> 1454977185 -0800

Merge branch 'aosp/upstream' into master

* commit 'b67fa5bcfdabb8c8e2f35e8bcd27b72c9ef60456':
  Update Android.bp with latest Makefile.ckati
  [C++] Optimize WordScanner with SSE4.2
  [C++] Make WordScanner faster by not using isspace
  [C++] Add a benchmark for WordScanner::Split

Change-Id: I7464dc50a20cd72d220bbc602aa92ad81218a192