tree f30cc77d291d43347f7e73acb914d949a51e1956
parent 94720d7ec40d2b5ee200d95a46588cdb0fb30e66
parent 9d0718042f7c0a50d825c621f82ce9a92071f07a
author Dianne Hackborn <hackbod@google.com> 1291852144 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1291852144 -0800

Merge "Fix issues #3257701 and #3267312"