tree a3362f95232447042a803bff7349f62f2c1e3f9e
parent d3651a6ad41c1451e90f538b9f66afb008a44216
parent edcab013674a4ef641c02d35c218ef78595890b6
author Marc Blank <mblank@google.com> 1333569305 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1333569305 -0700

Merge "Show "Folder settings" based on capabilities"