tree d5ad69eb246b5231fd6bb2f53e722da84f5740e2
parent 310b8ed349a7c7eb7282a5e1a5ace89f341ae28b
parent cac8862bb93031f75b2ba6eb528e1e954fb4a28d
author Julia Reynolds <juliacr@google.com> 1457020319 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1457020321 +0000

Merge "Inline settings update." into nyc-dev