OSDN Git Service

Merge "Handle returning a result from automatic up navigation from another task....
authorAdam Powell <adamp@google.com>
Wed, 16 May 2012 00:11:45 +0000 (17:11 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 16 May 2012 00:11:45 +0000 (17:11 -0700)

Trivial merge