projects / GitHub / LineageOS / android_hardware_samsung_slsi_exynos5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a08bbc5 1273f1b)
am 1273f1b7: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 2 Nov 2012 14:30:19 +0000 (07:30 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 2 Nov 2012 14:30:19 +0000 (07:30 -0700)
* commit '1273f1b7ace1772bc115f4252f2925de0c5c102d':


Trivial merge