OSDN Git Service

Fix merge error
authorAmith Yamasani <yamasani@google.com>
Fri, 17 Aug 2012 23:34:53 +0000 (16:34 -0700)
committerAmith Yamasani <yamasani@google.com>
Fri, 17 Aug 2012 23:34:53 +0000 (16:34 -0700)
commit14e883b25e0998e3bc4e574a0df3db252d6e987f
treef53985fbb455c63e418a7c4678aaeb26d60842f6
parent998ca2301c695c02966cc169ce2e407054dc7c5c
Fix merge error

Didn't apply the recent API change from another CL.

Change-Id: I65ac6108909eca7ac48beabb4a8b7bbedda84249
core/java/com/android/internal/app/ResolverActivity.java