tree 8adc9cf251eaac1c5c6964941c594db549e8dc26
parent df956eceefb6bf7addc0057572741237cacdfa12
parent 2a697feb3931a053a5c72913a461db7210119087
author Alain Vongsouvanh <alainv@google.com> 1465401108 +0000
committer android-build-merger <android-build-merger@google.com> 1465401108 +0000

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

Change-Id: Id1dcd42164121b4c31089c47fb56fb317da19896