am 1f5df2bc: (-s ours) am 5260313b: Remove linkage.uniform.basic.precision_conflict_...
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:48:26 +0000 (19:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:48:26 +0000 (19:48 +0000)
am: f838b6e41c

* commit 'f838b6e41c9e12b3b8c2b6c7701f788ca2d41eb5':


Trivial merge