am a52483de: am e8ef2961: Allow for larger LOD difference and fix another offset bug
authorPyry Haulos <phaulos@google.com>
Fri, 30 Jan 2015 21:33:05 +0000 (21:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 Jan 2015 21:33:05 +0000 (21:33 +0000)
* commit 'a52483de6bee171002514a1ec1275d9c4c99fc07':
  Allow for larger LOD difference and fix another offset bug


Trivial merge