tree b8fe9ad1d03b84a2999c6dcfe3721e899c11117e
parent bf292a0bd37959aa3b67df2daec3656f8178af68
parent 84a465aa0e795619b248047c5e21cd77c82b1ff1
author Adam Cohen <adamcohen@google.com> 1384252993 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1384252995 +0000

Merge "Small tweaks to custom content management" into jb-ub-now-jolly-elf