OSDN Git Service

Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity...
authorAdam Seaton <aseaton@google.com>
Tue, 23 Aug 2016 00:13:04 +0000 (00:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Aug 2016 00:13:04 +0000 (00:13 +0000)
commitfcd16254c6f0bb0a769c52280ad5ae8a2a5d03b2
treecdcfae7fa35c2d3ba2e022b035d7258cbc002ff4
parent27d769e3b0949652d154e5ef142a869d404b5c9b
parent0f1e7ab1d357d4ab911544c4224873dffebdad15
Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev
am: 0f1e7ab1d3  -s ours

Change-Id: Ic46aeb12f03e20c3379740934b4c80b228499124