tree 821ba50e2a3168bb8fd08202408d092f87882e2f
parent 7895f9be6b7af84d455af423bf60f3210fbb6b68
parent 3b1cbcd66abd48cf57124a380714576883fa77be
author Torne (Richard Coles) <torne@google.com> 1474475596 +0000
committer android-build-merger <android-build-merger@google.com> 1474475596 +0000

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

Change-Id: I0883684d7b4f82d7dea7d192125a5d46d68b96ae