tree 22ab385aa7c9a8437e35a96a0f059b1c4cbf7fd7
parent 64f46fb16ccae69f7a826585c5eaba48fe1b05da
parent 771b6eb8d9fb53c7fc2a3beb0e29d3e2619f35fd
author Alain Vongsouvanh <alainv@google.com> 1465400800 +0000
committer android-build-merger <android-build-merger@google.com> 1465400800 +0000

resolve merge conflicts of 6aa6ddb to nyc-dev
am: 771b6eb8d9

Change-Id: Ie0dabf5fb0930b75117193ae31e73df62d885903