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:40 +0000 (22:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Dec 2016 22:34:40 +0000 (22:34 +0000)
commite5b456769bbe12943babd641383c57d82ab4b9d3
treeb4c34f861284c67e866ea1ec863c733b192c6aed
parent670588f8103edce4b16fdf1c5e93cd22a49a6c02
parent108d39675da6b7d72422666b05e82deb24346293
resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f am: 52bab3789f
am: 108d39675d

Change-Id: Iee9f8deb6d1fee977e59d58a97d0b0f2b4e56129