tree 1419887fdb57cf78915cc0392fb40c771b9abe58
parent 3a19c4788d8c05d176f70e7965f2bffd4de1b0d5
parent e4a44cc7be0a49b7b3a0623751f7c59502697175
author Adam Cohen <adamcohen@google.com> 1392411221 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411221 +0000

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

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