tree 0f214c913559ecdc918fe85c0cf498aece47ed87
parent 312a0dad1c27e31a715f85979c70e12e65438b50
parent a8352055eba7117f26d17137c3cc884faf216006
author Marc Blank <mblank@google.com> 1333564950 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1333564950 -0700

Merge "Add flag for folder settings support"