tree 3bf52907c020ceff3e3d05e02ede2b34af57876d
parent 314b922b12e63507666026b6dd7bdac983ec75a5
parent c361b6fe3ed3a7e38547cb1c366750f6c3317fef
author Adam Cohen <adamcohen@google.com> 1384459177 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384459177 -0800

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

* commit 'c361b6fe3ed3a7e38547cb1c366750f6c3317fef':
  Small tweaks to custom content management