tree 92760071b84659d48bccf7db68e01faa90d45976
parent aad0ef1f4041c4e0b13c4567819d0b6762e64ec9
parent c1235a1ff202fddfa1df5ce5359555fbd9b47944
author Ruchi Kandoi <kandoiruchi@google.com> 1504209673 +0000
committer android-build-merger <android-build-merger@google.com> 1504209673 +0000

Merge "Do not call setAlwaysButtonEnabled if the activity doesn't support defaults." into oc-mr1-dev
am: c1235a1ff2

Change-Id: I109b96ae365e102428fbe6c7174ebd140145e293