tree 5c64036573622ef1291e24e8c0c5c036f3052484
parent 9ca6bac1996e2210f35202b0d05738e8d0d951c0
parent 3aabd770d916019d0656bbcd8b102a4033a26a38
author Tianjie Xu <xunchang@google.com> 1464031033 -0700
committer Tianjie Xu <xunchang@google.com> 1464031842 -0700

resolve merge conflicts of 3aabd77 to nyc-mr1-dev-plus-aosp

Change-Id: I834aba65cb29102055ff9e70969973a7870d0e60