am 59faa72b: am e8ef2961: Allow for larger LOD difference and fix another offset bug
authorPyry Haulos <phaulos@google.com>
Fri, 28 Aug 2015 04:10:46 +0000 (04:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 04:10:46 +0000 (04:10 +0000)
* commit '59faa72ba9612b12ccb3c82d5b3786ae6feb69c3':


Trivial merge