tree 4fd60f47f6eed3297fe619114219356c1e7ff056
parent b72ffa47a45ff35c5b0775c9f22d87698bd7aa7a
parent 1d21738bd67d0a7980193fe1ae6e57a72f0febe9
author Phil Weaver <pweaver@google.com> 1500402376 +0000
committer android-build-merger <android-build-merger@google.com> 1500402376 +0000

Back-port ag/2491664
am: 1d21738bd6

Change-Id: I30088c2cb1b8c343d21e0b095700df472127c612