tree 711b447846e5e4470f61aa566757c3b958fd9faa
parent 52f159c79e4ed3367a929f4bc34ab3e184f82a15
parent c6acd688c0cbd00f9407d676a51ee4994db51694
author Dianne Hackborn <hackbod@google.com> 1314985058 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1314985058 -0700

Merge "Fix issue #4554429: API REVIEW: deprecate Live Folders"