tree c24e3fb0f24bd693e63bfed48e497730164df079
parent 13d8ee8c72ae3705819e1e0afae765e2d66a89bf
parent 8176cf232e9f613a2e500f09461fc3f448267d07
author Tianjie Xu <xunchang@google.com> 1476828321 +0000
committer android-build-merger <android-build-merger@google.com> 1476828321 +0000

resolve merge conflicts of 6fba98c to stage-aosp-master
am: 8176cf232e

Change-Id: I01b34cb31604ea5caffe96ad69ab4d4d21bfe28e