tree d245a464a779fc9b3f911e217cb413c02d963256
parent dd019877a8cc9f17da2c538eee4af447f23cd170
parent 38660e5dfc2815e881a9d606699d21db544fc5ac
author Torne (Richard Coles) <torne@google.com> 1474476709 +0000
committer android-build-merger <android-build-merger@google.com> 1474476709 +0000

resolve merge conflicts of e9d901a to nyc-dev am: 3b1cbcd66a
am: 38660e5dfc

Change-Id: Ia6e4cfec76557101bc15e707d145bf5d085b47e3