OSDN Git Service

resolve merge conflicts of b281433 to nyc-mr1-dev-plus-aosp
authorTao Bao <tbao@google.com>
Fri, 24 Jun 2016 05:36:14 +0000 (22:36 -0700)
committerTao Bao <tbao@google.com>
Fri, 24 Jun 2016 05:36:14 +0000 (22:36 -0700)
commit707c4ae757322efd04d9dd7b75bd31135b73bcf7
tree4790460189b4f57f4d7404a9610b9124473754c5
parent9e71a9e1a169fcfbe6a1c1b79b58be814bbdad26
parentb2814336a0b13831f9114fee5d3d1e536c9bca03
resolve merge conflicts of b281433 to nyc-mr1-dev-plus-aosp

Change-Id: I392b6798ad68af80d13b7e45f7b7381b19a501ac