tree eb07eca94a481cd13ea947ee5ba80cdf79268ecb
parent 33376ab383fdcbbe18e4a4f4374c42b52294045a
parent 181df7851bd1eba4b6a3255073a8b731de23ae8f
author Mindy Pereira <mindyp@google.com> 1330638201 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1330638201 -0800

Merge "Let ComposeActivity use settings."