tree d245a464a779fc9b3f911e217cb413c02d963256
parent 1cebd6bab9e9d899beb32c3acb5d6e0975fffbeb
parent cc02176d06114ea1b2a9be637c136551ca19934e
author Torne (Richard Coles) <torne@google.com> 1474476221 +0000
committer android-build-merger <android-build-merger@google.com> 1474476221 +0000

resolve merge conflicts of e9d901a to nyc-dev am: 3b1cbcd66a  -s ours am: 7d0e41158b
am: cc02176d06

Change-Id: I7518fa53dffabba337478a848bc95257500656dc