tree a15df896769090e0cdfc3cce32c38cd61d9e2525
parent e468f6544f73a9e7e9d24b5f4d5a6fcb1fd77b8f
parent f857d026907444290c87d2329f0f3e0807efc491
author Dmitry Shmidt <dimitrysh@google.com> 1472501628 +0000
committer android-build-merger <android-build-merger@google.com> 1472501628 +0000

Cumulative patch from commit f5728d0a82d5c5fb5347e41ce761fdf4a79772ec am: 58d12adcdf
am: f857d02690

Change-Id: I1b1b69290d7a868e424d8c0e162678288ee47191