OSDN Git Service

Merge "Reorganize font enumeration API." into oc-dev
authorSeigo Nonaka <nona@google.com>
Tue, 4 Apr 2017 16:56:29 +0000 (16:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Apr 2017 16:56:29 +0000 (16:56 +0000)
commitde5fa6b3d844603f2c16a335a4d5372b366b7937
treede06fd4bf9d95f98f6ea9effb802e3b1fe03689e
parentce7558003b5012f837e72715d0f496d959a74633
parent2ac969827115c1b8bc86d9017eb1c7c1d5421b10
Merge "Reorganize font enumeration API." into oc-dev
am: 2ac9698271

Change-Id: Ie9bdcdb8d5997db421b783475e1058027cc4bb6f
Android.mk
api/current.txt
api/system-current.txt
api/test-current.txt
core/java/android/app/SystemServiceRegistry.java
services/java/com/android/server/SystemServer.java