tree a15df896769090e0cdfc3cce32c38cd61d9e2525
parent f55a3c80e2596117766dfa777ea73e218691ec72
parent 58d12adcdf693a076f719cef9b9f2ccf81892045
author Dmitry Shmidt <dimitrysh@google.com> 1472501436 +0000
committer android-build-merger <android-build-merger@google.com> 1472501436 +0000

Cumulative patch from commit f5728d0a82d5c5fb5347e41ce761fdf4a79772ec
am: 58d12adcdf

Change-Id: I098230f3db85cfb70bcdc8b2224beb59596167e0