| commit | 798f1a8abd12bb2a1afbdd6f46539c12ea12161b | [log] [tgz] |
|---|---|---|
| author | Victoria Lease <violets@google.com> | Wed Nov 14 13:25:21 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 14 13:25:21 2012 -0800 |
| tree | 4a4d2cde1686067b5612d3d9e97553e34b0dbc07 | |
| parent | 9ffbf1102fd04761ad844724e601dc79d827ca7c [diff] | |
| parent | c8b912aa9fc37241757a0622fbb1b80f0554e987 [diff] |
am c8b912aa: am 88337ac8: am 75819a9c: Merge "Resolve LocationManager + ActivityManager conflict" into jb-mr1.1-dev * commit 'c8b912aa9fc37241757a0622fbb1b80f0554e987': Resolve LocationManager + ActivityManager conflict