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)
am: 48687114b6

* commit '48687114b6c5310c8939700c8422a2c80bcddfca':

Change-Id: I06acfccdcc894c105171682095d58c1787912302


Trivial merge