OSDN Git Service

Merge "Bring back the Android Beam settings panel." into ics-factoryrom
authorJeff Hamilton <jham@android.com>
Thu, 22 Sep 2011 17:47:03 +0000 (10:47 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 22 Sep 2011 17:47:03 +0000 (10:47 -0700)
commit0d299625ebadae3d8b0881979633680e16b07daa
treea7addc9c8b1b52d14b8957dc6ca741eb7d32ed06
parent4a2aabc4d739ded949daa721adfce55fed2be2b6
parent3d670de5ce9180e0a75d0884832c4714cb56e1b5
Merge "Bring back the Android Beam settings panel." into ics-factoryrom
AndroidManifest.xml