OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e71a9e b281433)
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)
Change-Id: I392b6798ad68af80d13b7e45f7b7381b19a501ac


Trivial merge
build
About OSDN
Find Software
Develop Software
Help