OSDN Git Service

Merge "Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 23 Aug 2016 15:13:45 +0000 (15:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 23 Aug 2016 15:13:47 +0000 (15:13 +0000)

Trivial merge