| commit | 4cfe105506035f151242080e0ac7bd205542a2d9 | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Thu Sep 22 10:48:20 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 22 10:48:20 2011 -0700 |
| tree | b4bc375420423fd0bfc4fd84ac3197f164a9e668 | |
| parent | a1b6fdf4738e0d0aec4eb389316a7c354fe37c00 [diff] | |
| parent | 0d299625ebadae3d8b0881979633680e16b07daa [diff] |
am 0d299625: Merge "Bring back the Android Beam settings panel." into ics-factoryrom * commit '0d299625ebadae3d8b0881979633680e16b07daa': Bring back the Android Beam settings panel.