OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4b4a252
a1c0bea
)
Merge "Use the application\'s usesCleartextTraffic flag" am: d16f5f121e
author
Chad Brubaker
<cbrubaker@google.com>
Mon, 14 Dec 2015 20:05:20 +0000
(12:05 -0800)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 14 Dec 2015 20:05:20 +0000
(12:05 -0800)
am:
a1c0bea895
* commit '
a1c0bea89518d020b615740215bff7fc4356e991
':
Use the application's usesCleartextTraffic flag
Trivial merge