OSDN Git Service

Merge "resolve merge conflicts of b9d266f to nyc-dev-plus-aosp" into nyc-dev-plus...
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 7 Jun 2016 18:00:24 +0000 (18:00 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 7 Jun 2016 18:00:25 +0000 (18:00 +0000)
commite61d3ff3d131c2f28adee085557cd93853af5e72
tree3fd637b34a3468f661b4e2cd1b13d41ef51a6d34
parent36ff488bb475d52629fea412dcd7af57bb3d441f
parent4cb2741230cc29ccf36664bd6a4ff103c9f1f280
Merge "resolve merge conflicts of b9d266f to nyc-dev-plus-aosp" into nyc-dev-plus-aosp