am 6fe4621d: Reduce rendering load in large sync tests by 90%. am: 29a994fbbb
authorJarkko Pöyry <jpoyry@google.com>
Mon, 11 Jan 2016 19:42:18 +0000 (19:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:42:18 +0000 (19:42 +0000)
am: bb656704ac

* commit 'bb656704acb1fabcf5fe74edc55948bbc4d8c6bd':


Trivial merge