tree 148c5221b8f54a997d505d0db23593363f4cf0e2
parent 1373972f5340cfbcea67e1cf8f44209920e76b93
parent 89bf0cf1bccc387888698df02767a9dc1013c34a
author Dmitry Shmidt <dimitrysh@google.com> 1478737776 +0000
committer android-build-merger <android-build-merger@google.com> 1478737776 +0000

Merge "Cumulative patch from commit 4ec1fd8e42bad9390f14a58225b6e5f6fb691950" am: fa94a1c1e3
am: 89bf0cf1bc

Change-Id: Ib2c997329c94d81219979fa7b7360ffe256da74b