tree 9bb039fe0172b450bb243877ef9d7c2e8b8e3026
parent b88c96f2ef20e2b648c34e08f54b22adf3b87c0e
parent b01e81e28cc9b1eb768d8ef3d0043135571bca94
author Xin Li <delphij@google.com> 1534213709 -0700
committer android-build-merger <android-build-merger@google.com> 1534213709 -0700

resolve merge conflicts of 256b825447c7288dad5f9dc4fb83a529dd4c46ee to master am: de18516653 am: d254a8926c
am: b01e81e28c

Change-Id: I74114ea7857dcfbe28396ebafaff0be55b50ed70