Merge changes Ie15e301e,Ib070c79b
authorJames Zern <jzern@google.com>
Sat, 23 May 2015 17:47:51 +0000 (17:47 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Sat, 23 May 2015 17:47:52 +0000 (17:47 +0000)
commit02fda6582caa15ed8f68f335676f3b8cf18f3945
tree5fe4a804d25e7044f2747fe8352e1baff9740774
parent8c15ced1729d1739a01eb3e556e35f4fb2709aa1
parent4e11f3ca6e4ef284b388d62ed9515b9ac746fc4e
Merge changes Ie15e301e,Ib070c79b

* changes:
  vp9_reconintra_neon: cosmetics: reindent
  vp9_reconintra_neon: cosmetics: drop unneeded returns