tree 89c9ddeaade8e5f058090180bd0b5049efb7fa3d
parent e1bd986d77afc9426e320b7cce53993086f9d8ba
author Hyunyoung Song <hyunyoungs@google.com> 1456256181 -0800
committer Hyunyoung Song <hyunyoungs@google.com> 1456256181 -0800

Manual revert due to conflict:

Revert "Load label in bg thread to prevent ANR b/27238970"

This reverts commit b62fd0957607ae54c7bca7ce64eed288a11f0f2f.

Change-Id: Ia751e3414fb24a18bb8bb9ca09dcd93d0e4249f6