OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2417e6 fddbf1b)
Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev
authorAdam Vartanian <flooey@google.com>
Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)
* changes:
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
  Adjust URI host parsing to stop on \ character.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help