tree 4b434e5d1bb477072c51e5004f5cf09ea2e611ae
parent ac3102d615a44c36c50001bb8cdebb7ec215599b
parent 2452cde3b8d7cbe62f6eb2fbcbcf9a02448d6891
author Dake Gu <dake@google.com> 1484350992 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1484350993 +0000

Merge "Switch from getActivity() to getContext()" into nyc-support-25.2-dev