OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a2df74 4177b8c)
am 4177b8cb: Merge "Add app-level usesCleartextTraffic manifest attribute."
authorAlex Klyubin <klyubin@google.com>
Thu, 19 Mar 2015 16:21:40 +0000 (16:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Mar 2015 16:21:40 +0000 (16:21 +0000)
* commit '4177b8cbbfa239d68a9283124638d9399a5dd0de':
  Add app-level usesCleartextTraffic manifest attribute.


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