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