tree cba62d0d64153aa2169651696bc238591341d679
parent ac76ec8267039c03a3c4927648d0f3e1646ce8cd
parent 53cb2ba4218a79b7a739aa195c3c00784e968979
author Adam Cohen <adamcohen@google.com> 1414085472 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085472 +0000

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

* commit '53cb2ba4218a79b7a739aa195c3c00784e968979':