resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f am...
authorNicolas Boichat <drinkcat@google.com>
Tue, 20 Dec 2016 22:34:24 +0000 (22:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Dec 2016 22:34:24 +0000 (22:34 +0000)
commit670588f8103edce4b16fdf1c5e93cd22a49a6c02
treeb4c34f861284c67e866ea1ec863c733b192c6aed
parent139dddc36e055e554754d9eba13126b15d1505eb
parent53e70a911c5c92ade6561f63603f71875a46f721
resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f am: 1486f7ae07
am: 53e70a911c

Change-Id: Ie8639f12c0a664c24011c35d16259c0ca7ffe568