am 5706445b: (-s ours) am 5c541594: Remove a couple of primitive_bbox line cases...
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 10:45:57 +0000 (10:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:45:57 +0000 (10:45 +0000)
* commit '5706445ba2744771772b1c4720d7e5afa226c45a':


Trivial merge