Repository files (latest commit first)

Filename	Latest commit message	Latest commit date
Lorenzo Colitti db624146ac resolve merge conflicts of 6c3cd4449517 to oc-dev-plus-aosp ... Test: make -j64 framework services FrameworksNetTests Change-Id: Ib828e56b271cd983ef325e366418ca8db9774628		2017-03-28 23:49:11 +09:00
..
android/server	resolve merge conflicts of 6c3cd4449517 to oc-dev-plus-aosp	2017-03-28 23:49:11 +09:00