tree 5a72c44e196d110faa67a127da1364f89a43b612
parent 1afd591a09cee35d0cafac3c1d7f236fe28cf274
parent 3f6eb86390e27707d1204e60e33b6a41e88f0dc8
author Tianjie Xu <xunchang@google.com> 1464052622 +0000
committer android-build-merger <android-build-merger@google.com> 1464052622 +0000

resolve merge conflicts of 50f6417
am: 3f6eb86390

* commit '3f6eb86390e27707d1204e60e33b6a41e88f0dc8':
  resolve merge conflicts of 50f6417

Change-Id: Id8410b617d811dccfa0979cf82859c4880d216d5