tree 507140f99e14869d92e773a0d43d31d5860dc13f
parent 88c7e86803a017c5d5381665d18bea312bcc5641
parent af32863e1dd88292bf9825d028551ca399fb39b5
author George Mount <mount@google.com> 1488829006 +0000
committer android-build-merger <android-build-merger@google.com> 1488829006 +0000

Merge "Fix Loader bugs" into nyc-support-25.2-dev
am: af32863e1d

Change-Id: I5ca109f81914aa3b92b7ebc69af2131b8390348a