OSDN Git Service

Merge "Expose Credentials.UNLOCK_ACTION for callers that want to use startActivityFor...
authorBrian Carlstrom <bdc@google.com>
Sun, 24 Apr 2011 04:01:35 +0000 (21:01 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sun, 24 Apr 2011 04:01:35 +0000 (21:01 -0700)

Trivial merge