tree af2fa04d5b0d6cc01bd26946ac92287186164fc1
parent fcceb3ada4c633fcd7eb43c04c5546373d2f04bf
parent 70753081c8d40ad1146dfa5d3cf3fbbb39da36ce
author Geoffrey Pitsch <gpitsch@google.com> 1499878253 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499878253 +0000

Merge "canBeModified accessors for AmbientDisplay pickup setting" into oc-dr1-dev