OSDN Git Service

Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity...
authorGeorge Mount <mount@google.com>
Tue, 23 Aug 2016 16:19:09 +0000 (16:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Aug 2016 16:19:09 +0000 (16:19 +0000)
commita19e7ca122308af3fbc5147063a3460971f9cb03
tree9521160709142553fa330ebd4a21c8682ee538c0
parent9fd645996738bf24efb12b7e9e5f476724a4ba2a
parent986912ee693de2dd653617eb85eeaaf3348b58be
Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity. am: c9373e5505  -s ours am: 27d769e3b0  -s ours" into cw-f-dev
am: 986912ee69  -s ours

Change-Id: I35565278f999f97bf2ffd9e2ba6d197152fa20e5