tree f5fc3e41865f2704efc064b9de4f15604dc4ae77
parent b427f30e4da1141ec0266cfad8cbfb63a1760bc6
parent 1774a8a0c67ae225b31dfb37213d6cadc630e48c
author Adam Cohen <adamcohen@google.com> 1384521664 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1384521665 +0000

Merge "Fix for transparent CustomContent screen (issue 11549096)" into jb-ub-now-jolly-elf