tree 2c87294272c102b50dacf2851e2b36d964134615
parent d1c3f26e5911719ba6e979805e005f79e7f6f6ee
parent 87119ab3e2b7b081daa18495f88224deb0f8aed7
author Charles Munger <clm@google.com> 1574459718 -0800
committer android-build-merger <android-build-merger@google.com> 1574459718 -0800

Merge "Deprecate ListActivity and ExpandableListActivity" am: 0600b03d46
am: 87119ab3e2

Change-Id: Id3f4e5cc41c143161b0fc5d7b173a1baff88de5b