tree a47c015e77cc80aa0196fbbf7858358873204f56
parent 68b296fce10a9385c87259475115a87af1872127
parent 5cb3b7a7a238d7267e3e124d6bd50fef652ef83b
author Todd Kennedy <toddke@google.com> 1458916226 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1458916228 +0000

Merge "Quiet intent resolver" into nyc-dev