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

* commit '74b42c11171bc5268ddb1d6159668c1059be7e03':


Trivial merge