OSDN Git Service

am 019b1f26: am 2ea983a5: am 3d9bcb90: Create FEATURE_ constants for print and backup
authorAdam Lesinski <adamlesinski@google.com>
Tue, 18 Feb 2014 23:03:37 +0000 (23:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Feb 2014 23:03:37 +0000 (23:03 +0000)
* commit '019b1f2668ac17f5e52b6ce32a524d26134a062a':
  Create FEATURE_ constants for print and backup

1  2 
api/current.txt
core/java/android/content/pm/PackageManager.java
services/java/com/android/server/SystemServer.java

diff --cc api/current.txt
Simple merge