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

Change-Id: I0a5d182b1c76e979346eb244c1b25bc3014e8208