am f838b6e4: am 1f5df2bc: (-s ours) am 5260313b: Remove linkage.uniform.basic.precisi...
authorKalle Raita <kraita@google.com>
Thu, 27 Aug 2015 14:47:05 +0000 (14:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:47:05 +0000 (14:47 +0000)
* commit 'f838b6e41c9e12b3b8c2b6c7701f788ca2d41eb5':


Trivial merge