tree 96a8c0cf6bf234f76dd42be73c1a53d8967766eb
parent 219e11ef9d25501677e51b6497ae71cea1717141
parent fb310f6a2f5aa3f0a9e0763d1b0ec62001bf9a3d
author Adam Powell <adamp@google.com> 1465506578 +0000
committer android-build-merger <android-build-merger@google.com> 1465506578 +0000

Merge \\"Make Activity.getReferrer tolerate custom Parcelables in intents\\" into nyc-dev am: 7a37f8945f
am: fb310f6a2f

Change-Id: I6b4120fcda293d0b4edae7ada60946c839675780