resolve merge conflicts of b81edb4 to master
authorDavid Sodman <dsodman@google.com>
Thu, 22 Dec 2016 05:25:45 +0000 (05:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Dec 2016 05:25:45 +0000 (05:25 +0000)
commit49ddc6319b80390b0c9a01f25b1726e0de8befe6
tree44d34133bc3a46231a9580b071851c69ca1e4a63
parent490048f2a6d9f60d26948e47249ae9f291e1a0cf
parentce5292f5844e6d40714ccb5d6ec33919a3f3ab0c
resolve merge conflicts of b81edb4 to master
am: ce5292f584

Change-Id: I0bd3fa65bf2e456829fc609d3cd743c0508f856d