tree 107c7f8270f3a02f0d8fc3df33ec7e38fd86fff7
parent af7bdc646088e3112052f4fd35061bb720393287
parent bb12ac9b85adae96cbd38b2220c5da9a9d80bc54
author Jean-Baptiste Queru <jbq@google.com> 1294681214 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1294681214 -0800

Merge changes Ife2dd406,I1ac481a2 into honeycomb

* changes:
  Assembly coded android_memset16 and android_memset32
  init: Fix parser line numbering