tree 64a8d89bd95613e6cecbe32101038d9d5486ceb5
parent c697ffe98b4d190b99e9d5de80fbf9f7ba5df194
parent 4c349b67aa20d6cc3cd8be80c645fbadc3affc98
author Android Build Merger (Role) <android-build-merger@google.com> 1484342785 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1484342788 +0000

Merge "resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1 am: 9af145dcc4" into nyc-mr2-dev-plus-aosp