OSDN Git Service

Merge "Merge "resolve merge conflicts of b9d266f to nyc-dev-plus-aosp" into nyc-dev...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 7 Jun 2016 18:04:20 +0000 (18:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 7 Jun 2016 18:04:22 +0000 (18:04 +0000)
commitc06eedb353f33c86615279ffd29cc8b3a5cb0d79
treeb2afa73c9bf8ad7975e388093866fa2b13f93568
parent942b04e5dc3b932334c8bd5ae49a9e0366377dd8
parent1a0bc037bb32642e75152d4822ae818b61c32286
Merge "Merge "resolve merge conflicts of b9d266f to nyc-dev-plus-aosp" into nyc-dev-plus-aosp am: e61d3ff3d1" into nyc-mr1-dev-plus-aosp