tree ea5e24041f6cb682b41990978e14b6f3f7be9c46
parent 1823cd2a8fb6237415622524ac87d8d5364332a0
parent 5d810f47da47218d6e6e13ccf2414c7955d4aaad
author Hall Liu <hallliu@google.com> 1491421743 +0000
committer android-build-merger <android-build-merger@google.com> 1491421743 +0000

Merge "Query geo description in worker thread to prevent ANR" am: eb7c287c71 am: 53d241411a am: b0e36dec89
am: 5d810f47da

Change-Id: Ib7ee22cee691b0fa7d6a247c564a3f640d5cbe33