Commits
Victoria Lease authored and Android Git Automerger committed 88337ac8c0aM
am 75819a9c: Merge "Resolve LocationManager + ActivityManager conflict" into jb-mr1.1-dev * commit '75819a9cddd646af72a6071311d8e5b3cd6b8c43': Resolve LocationManager + ActivityManager conflict
Showing diff to75819a9cddd