OSDN Git Service

Merge "resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev am: eb35ad9969 am:...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 13 Jan 2017 21:26:25 +0000 (21:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 13 Jan 2017 21:26:28 +0000 (21:26 +0000)
commit6d85c8a833b27d58f69faf62f1f4ce951ef9d672
tree64a8d89bd95613e6cecbe32101038d9d5486ceb5
parentc697ffe98b4d190b99e9d5de80fbf9f7ba5df194
parent4c349b67aa20d6cc3cd8be80c645fbadc3affc98
Merge "resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1 am: 9af145dcc4" into nyc-mr2-dev-plus-aosp