tree 5145fbc12f3c224db6d6c30c6e12b8d1964e3138
parent 02e54d3c6ad989e8e1463ea5fc32ed9dfa1de19d
parent 36246a43e54503e5be6b52ce9dcb08c8b1388bf5
author David Christie <dnchrist@google.com> 1472088330 +0000
committer android-build-merger <android-build-merger@google.com> 1472088330 +0000

resolve merge conflicts of 8aaffd9 to nyc-dev
am: 36246a43e5

Change-Id: Ic91baff73ef9e5ffe304d10a5a55e8476dfcfecb