OSDN Git Service

Merge "Resolve LocationManager + ActivityManager conflict" into jb-mr1.1-dev
authorVictoria Lease <violets@google.com>
Wed, 14 Nov 2012 21:18:57 +0000 (13:18 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 14 Nov 2012 21:18:58 +0000 (13:18 -0800)
commit75819a9cddd646af72a6071311d8e5b3cd6b8c43
treef9fddd42c2f6adc914e7d1306daf616ce22ca720
parentf4ad01922dcbf9d9da542a507b48fb194b50e295
parent61ecb02f544d9abd098506afb50cb514818f4eb4
Merge "Resolve LocationManager + ActivityManager conflict" into jb-mr1.1-dev