tree 8c86119d7950671e72bb99b247bcee4844804764
parent 671a4f1ead5761dbb9f387c2973a1decd0321a45
parent c746913f706242de1e2af99208c2f2abe391962a
author Android Build Merger (Role) <android-build-merger@google.com> 1461855098 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1461855098 +0000

Merge "Merge "Revert "Moves get/setAllowGeneratedReplies to NotificationCompat.Action"" into nyc-dev am: 398a6b2 am: 8ce77b8" into nyc-mr1-dev-plus-aosp