resolve merge conflicts of 9b726ab8 to master
authorMika Isojärvi <misojarvi@google.com>
Fri, 22 Sep 2017 20:21:08 +0000 (20:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Sep 2017 20:21:08 +0000 (20:21 +0000)
commitb1cc8aeac9ab7d00e86f2a997a4ad1e942157224
tree0cf76e404c1dc1a784b50062e6d9200d13c21f02
parent32ad11b59d689bca06d17215ac2bac63e0834749
parent02473c7876fd828052ec60d7eb4dc94d32eb0723
resolve merge conflicts of 9b726ab8 to master
am: 02473c7876

Change-Id: Ibd5f5c37ad2e3590fe5fa4d3512985178c0fb2a9