tree 77b1778c0960b563a676cd083961310f7868120e
parent 2d38cc80afface3fcc5371e358e1d9a98c8b7aca
parent f834dfabbcbbe1f209682f18c67f2e8b9d3e1dd7
author Dianne Hackborn <hackbod@google.com> 1288131918 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1288131918 -0700

Merge "ClipDescription no longer inherits from ClipData."