am 74b42c11: am 5706445b: (-s ours) am 5c541594: Remove a couple of primitive_bbox...
authorPyry Haulos <phaulos@google.com>
Thu, 27 Aug 2015 14:46:54 +0000 (14:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:46:54 +0000 (14:46 +0000)
* commit '74b42c11171bc5268ddb1d6159668c1059be7e03':


Trivial merge