resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f
authorNicolas Boichat <drinkcat@google.com>
Tue, 20 Dec 2016 22:24:55 +0000 (22:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Dec 2016 22:24:55 +0000 (22:24 +0000)
commit108d39675da6b7d72422666b05e82deb24346293
tree325aaa1e530b9b2b3c8c5dd927b052ea2e39ab98
parent7385ca9abac5dd675f26ad4e96f1b22d5c5bbabc
parent52bab3789f2b8d0025e847d1046212ad25eb2d79
resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f
am: 52bab3789f

Change-Id: Ie5115233fc6bef645f14f03e69039188dfd6d908