am 5706445b: (-s ours) am 5c541594: Remove a couple of primitive_bbox line cases...
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:51:11 +0000 (19:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:51:11 +0000 (19:51 +0000)
am: 7cc5fa1b8f

* commit '7cc5fa1b8ff7a2f6551190e208cb2d75fc92e680':


Trivial merge