tree 87f6cdd0831a3b4c8ff42c921f3bdf21ccb9ba0b
parent b13236a4d55994f7045b22bc12d512df475be650
parent 613bc05ba6213a51f9f6570fac650c4eae07bbc1
author Christopher Ferris <cferris@google.com> 1453772453 +0000
committer android-build-merger <android-build-merger@google.com> 1453772453 +0000

Merge "Fix gcc test issues." am: 126cf324a3
am: 613bc05ba6

* commit '613bc05ba6213a51f9f6570fac650c4eae07bbc1':
  Fix gcc test issues.