tree 10da860fcff71886af91d082e31f0e1917926848
parent 9a4233acbdf159df37f3ca3f222ef4bb77d0fdac
parent ac869d9031182619d8672e87d3fad2e214a1c38d
author Adam Cohen <adamcohen@google.com> 1414566352 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566352 +0000

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

* commit 'ac869d9031182619d8672e87d3fad2e214a1c38d':