tree d57903384112121b90e23e126f85ad2295cf68c8
parent 61ae34afe3473909f5e6f0d90a889757d99ea12f
parent 8e77733656c8d566b8fdbb259adb042e03be006a
author Makoto Onuki <omakoto@google.com> 1490735320 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1490735325 +0000

Merge "Don't do heavy work on UiThread." into oc-dev