| commit | 5e9f8551c4f30871d509b9af62c813610da6aea8 | [log] [tgz] |
|---|---|---|
| author | iceandfire <arhamjamal@gmail.com> | Sun Feb 17 01:00:48 2013 +0530 |
| committer | iceandfire <arhamjamal@gmail.com> | Sun Feb 17 01:00:48 2013 +0530 |
| tree | 7b04efe00b07b59c275ed0d622330a70e6dccaeb | |
| parent | 13f87df84391a04bc31add4d181d853e5bdcfec8 [diff] | |
| parent | 29a4eb7a33da12a957b3305138ada69140d8ab75 [diff] |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/Settings into jb-mr1 Android 4.2.2 release 1 Conflicts: AndroidManifest.xml src/com/android/settings/ChooseLockGeneric.java src/com/android/settings/ChooseLockPatternTutorial.java Signed-off-by: iceandfire <arhamjamal@gmail.com>