OSDN Git Service

am ec033943: am 9873e099: am 55740325: Merge "Add leanback device features." into...
authorTim Kilbourn <tkilbourn@google.com>
Fri, 14 Mar 2014 20:50:40 +0000 (20:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Mar 2014 20:50:40 +0000 (20:50 +0000)
* commit 'ec0339437869ebb42a67a2811dc6de31239d5d62':
  Add leanback device features.

1  2 
api/current.txt
core/java/android/content/pm/PackageManager.java

diff --cc api/current.txt
Simple merge