tree d245a464a779fc9b3f911e217cb413c02d963256
parent 5b2e1c83f28101bd64b04a67fc011db7e278f21e
parent 7d0e41158b402812a4d2be64e00d35b179f6a17c
author Torne (Richard Coles) <torne@google.com> 1474476070 +0000
committer android-build-merger <android-build-merger@google.com> 1474476070 +0000

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

Change-Id: I13e7e098b8e9fd935fd9256841e672fbfea3132c