commit | 0d299625ebadae3d8b0881979633680e16b07daa | [log] [tgz] |
---|---|---|
author | Jeff Hamilton <jham@android.com> | Thu Sep 22 10:47:03 2011 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 22 10:47:03 2011 -0700 |
tree | a7addc9c8b1b52d14b8957dc6ca741eb7d32ed06 | |
parent | 4a2aabc4d739ded949daa721adfce55fed2be2b6 [diff] | |
parent | 3d670de5ce9180e0a75d0884832c4714cb56e1b5 [diff] |
Merge "Bring back the Android Beam settings panel." into ics-factoryrom