OSDN Git Service

Merge "resolve merge conflicts of 7031dac to nyc-mr1-dev-plus-aosp" into nyc-mr1...
authorRobert Sesek <rsesek@google.com>
Thu, 13 Oct 2016 18:55:34 +0000 (18:55 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 13 Oct 2016 18:55:37 +0000 (18:55 +0000)
commitf43d5b36d60d25b7d6f3fc2f791e2f0e26575de5
tree7ad74aea8fc3ed1143e834a2a40d5d9feda0a2d5
parent4480f347f878ebba375e1ea6f625cc39610bd79d
parentd414158f7926511ad7e212cdaaeba69e1a3b8fda
Merge "resolve merge conflicts of 7031dac to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp