tree c1e7103b59af5d74eb576ebab7b14d34be5c0e53
parent ab1eed7f6f88bb8d4f08f2ac797a482bd8749982
parent 61da13a57f0bb13fff93e89324e52fe61b14570f
author Alain Vongsouvanh <alainv@google.com> 1465401406 +0000
committer android-build-merger <android-build-merger@google.com> 1465401406 +0000

resolve merge conflicts of 6aa6ddb to nyc-dev am: 771b6eb8d9 am: 2a697feb39
am: 61da13a57f

Change-Id: I38702eb8b5e7a8455cc2a531e5c0fffaa4d955cc