tree b114df21a0dadc9a58c435d554443bc7c7c4ff4b
parent 2026a5a91feabaa8711d9fa1272fa9dbed355bcc
parent 5b34b3ae6d330ffc0fd9996cf21fbe3b7622c526
author Adam Cohen <adamcohen@google.com> 1392410268 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410268 +0000

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

* commit '5b34b3ae6d330ffc0fd9996cf21fbe3b7622c526':
  Small tweaks to custom content management