tree 29301787c239f7497f9b86b74a477449ead4e7b2
parent 02cb38ff789c70d67fdf126d4ac127c343f45162
parent b6eac1771e77f1f8cce68dbba3467e1ada437888
author Alan Viverette <alanv@google.com> 1493220571 +0000
committer android-build-merger <android-build-merger@google.com> 1493220571 +0000

Merge "Deprecate ActionBarDrawerToggle inner classes, update API file" into nyc-support-25.4-dev
am: b6eac1771e

Change-Id: Ic8895f99a5ca487ae9d58e5c6c604ca93e4c9c18