tree 8bc595678bef3963ee79283ea8414b702f7c1cb3
parent 1f72ee6ad3f8acb122df4c9f68a6db50a184e40a
parent 05c800a161c1a33884745695e06f4b8caf0bf55d
author Dmitry Shmidt <dimitrysh@google.com> 1472504345 +0000
committer android-build-merger <android-build-merger@google.com> 1472504345 +0000

Cumulative patch from commit 37fd0be2d3ca50c9035e67041328099356a46860 am: 4ae50e65ef am: a09d6b3e21
am: 05c800a161

Change-Id: Ice0ad1137fd5dc0f0415f72d385a5a4502f7235e