tree db6c9e8cbb096f0b3b0627c419ce179b79bb8dfc
parent d7160b83cda3b25340d67934642ba586df4115bf
parent 76a560cab14a08beac287f2f02139f7c6dc962d2
author Alex Hills <ahills@google.com> 1461851648 +0000
committer android-build-merger <android-build-merger@google.com> 1461851648 +0000

Merge "Move allowGeneratedReplies to Action" into nyc-dev am: 9de0f87 am: 2a1a315
am: 76a560c

* commit '76a560cab14a08beac287f2f02139f7c6dc962d2':
  Move allowGeneratedReplies to Action

Change-Id: I10055fa54d58f86bb186ff249de587e08d6d9d7f