| commit | be6edef52a7e1a593f582a9ee64e3b0cbb7b7382 | [log] [tgz] |
|---|---|---|
| author | Dirk Rettschlag <dirk.rettschlag@gmail.com> | Thu Feb 14 15:10:10 2013 +0100 |
| committer | Dirk Rettschlag <dirk.rettschlag@gmail.com> | Thu Feb 14 15:10:10 2013 +0100 |
| tree | 8533b22ed4f980a418594eb9f90132949c408b4f | |
| parent | 1080f9a3a3edb38d86ecdebc8e5bacb16232d514 [diff] | |
| parent | 0ed03e8e14cf2edcda9ee3ecc604d4e048c8ccf3 [diff] |
Merge tag 'android-4.2.2_r1' into HEAD Android 4.2.2 release 1 Conflicts: res/xml/settings.xml src/com/android/deskclock/ScreensaverActivity.java src/com/android/deskclock/SettingsActivity.java src/com/android/deskclock/Utils.java