Merge "Reduce iteration count in object_management.multithreaded*.device am: af3898e...
authorPyry Haulos <phaulos@google.com>
Thu, 28 Apr 2016 11:47:33 +0000 (11:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Apr 2016 11:47:33 +0000 (11:47 +0000)
am: 860941f

* commit '860941f907afa59f27f8ca3eba7e1270993432d4':

Change-Id: Ied3aac902eff854ec1298187948df290f38f20eb


Trivial merge