| commit | 0cbd7115e5c4f745007bc78caf85dd17f20df66e | [log] [tgz] |
|---|---|---|
| author | ayysir <dresadd09691@gmail.com> | Tue Apr 29 03:20:37 2014 -0400 |
| committer | ayysir <dresadd09691@gmail.com> | Tue Apr 29 03:20:37 2014 -0400 |
| tree | cef5a0adea7710feac362a0864c7f44e5414ecff | |
| parent | f1c7ee19d71ca8c7e340cfd604f323fc3636cd7d [diff] | |
| parent | 8fbd1c458770528dd1379a5c5afc5bcd64a89a46 [diff] |
Merge branch 'cm/stable/cm-11.0' Conflicts: overlay/packages/apps/Camera2/res/values/config.xml rootdir/fstab.smdk4210 rootdir/init.smdk4210.rc