tree d793124fbf3d3b4d933a11dbe8c4f788be9e8dd5
parent 1716ecf4ccb3dee0beae71885117ec8c00fe6826
parent 75819a9cddd646af72a6071311d8e5b3cd6b8c43
author Victoria Lease <violets@google.com> 1352928072 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352928072 -0800

am 75819a9c: Merge "Resolve LocationManager + ActivityManager conflict" into jb-mr1.1-dev

* commit '75819a9cddd646af72a6071311d8e5b3cd6b8c43':
  Resolve LocationManager + ActivityManager conflict