Merge "resolve merge conflicts of cfeb3c0 to nyc-dev am: 518f489214 am: 5e80b7e463...
authorMika Isojärvi <misojarvi@google.com>
Fri, 6 May 2016 19:22:29 +0000 (19:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 May 2016 19:22:29 +0000 (19:22 +0000)
commite6f5a6d09f327d9be13b4087eaf23797076ea97c
tree3855d402350251c6ba530eb7381873786785730b
parent1bfad816c416a8b38faa32c77dd25511c37de47e
parent48687114b6c5310c8939700c8422a2c80bcddfca
Merge "resolve merge conflicts of cfeb3c0 to nyc-dev am: 518f489214 am: 5e80b7e463" into nyc-mr1-dev-plus-aosp
am: 48687114b6

* commit '48687114b6c5310c8939700c8422a2c80bcddfca':

Change-Id: I06acfccdcc894c105171682095d58c1787912302