tree 9de1604337a4a12972bcf11ca913ab6631bf027a
parent 1afa4d7b23ce8b9852cda1f495145f320414c3d4
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: Icc7290bbdf7b7420bab34b56f4e368f93b007053