OSDN Git Service

resolve merge conflicts of f2801e4 to nyc-mr1-dev
authorLorenzo Colitti <lorenzo@google.com>
Thu, 6 Oct 2016 20:27:49 +0000 (20:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Oct 2016 20:27:49 +0000 (20:27 +0000)
commitbe3924c1b60b20ec35d13ab945b6cd04b001f9b6
tree4b44e0d22c68ac4ab1587fb060f332eaa533a2bc
parent9264154bee2728998ca23990293be61bc254a331
parentb01c080b086d77c3f1f75e92c4096198411b2aef
resolve merge conflicts of f2801e4 to nyc-mr1-dev
am: b01c080b08

Change-Id: I7eb92f48024bf8298f2a31c0acfa87a355be872a