No description. Add one?
  • Java 78%
  • Kotlin 11.8%
  • AIDL 4.4%
  • C++ 3.7%
  • C 1.5%
  • Other 0.5%
Find a file
Repository files (latest commit first)
Filename Latest commit message Latest commit date
Hugo Benichi 0c57cf16ee resolve merge conflicts of 4f2a0fe213e5 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I61cfb2d4798350f28f1bb36aed67ee8f18895031
2017-07-14 07:25:51 +09:00
core resolve merge conflicts of 4f2a0fe213e5 to stage-aosp-master 2017-07-14 07:25:51 +09:00
services Merge "Connectivity: Fix format arguments" 2017-07-12 04:48:10 +00:00
tests/net Merge "ConnectivityManager: allow usage of TYPE_NONE" 2017-07-05 14:33:35 +00:00