tree 8adc9cf251eaac1c5c6964941c594db549e8dc26
parent df956eceefb6bf7addc0057572741237cacdfa12
parent 91d78acbd39ab0235daa46c61742a371266bd003
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: 91d78acbd3

Change-Id: Ib2c1caa0a5f43d708634aaa69b8b1a9fc094edeb