tree 1419887fdb57cf78915cc0392fb40c771b9abe58
parent 5e4304ea3b4afce41aa6e08acb692e0860eb504f
parent 53cb2ba4218a79b7a739aa195c3c00784e968979
author Adam Cohen <adamcohen@google.com> 1392411686 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411686 +0000

am 53cb2ba4: am e4a44cc7: am 5b34b3ae: am c361b6fe: Merge "Small tweaks to custom content management" into jb-ub-now-jolly-elf

* commit '53cb2ba4218a79b7a739aa195c3c00784e968979':
  Small tweaks to custom content management