tree f65b0d13a054395dd09201dcff46c5bd655bd997
parent 592078f554b2074033d4de1609c86d66ad9dc9ac
parent 553c7bd307ef27537bf8cb05162ba7e9da76ae95
author Tao Bao <tbao@google.com> 1489851203 +0000
committer android-build-merger <android-build-merger@google.com> 1489851203 +0000

resolve merge conflicts of 90d3f20c to stage-aosp-master
am: 553c7bd307

Change-Id: I78b16c412ce3487651c0b2da467256488dd75ff5