| commit | c8b912aa9fc37241757a0622fbb1b80f0554e987 | [log] [tgz] |
|---|---|---|
| author | Victoria Lease <violets@google.com> | Wed Nov 14 13:22:51 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 14 13:22:51 2012 -0800 |
| tree | 4b357e1924e208f36db5a592e7f797061aa01521 | |
| parent | 8578c51771a0cae379ad941ab1e9e4f1b8237da2 [diff] | |
| parent | 88337ac8c0ada1f3baef25cf9d4d9d85b2a8459e [diff] |
am 88337ac8: am 75819a9c: Merge "Resolve LocationManager + ActivityManager conflict" into jb-mr1.1-dev * commit '88337ac8c0ada1f3baef25cf9d4d9d85b2a8459e': Resolve LocationManager + ActivityManager conflict