OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc91f6f 305013b)
am 305013b1: (-s ours) am b4a50745: am c736f794: am a74da813: am d43d5bec: Merge...
authorAlan Viverette <alanv@google.com>
Fri, 14 Mar 2014 10:02:44 +0000 (10:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Mar 2014 10:02:44 +0000 (10:02 +0000)
* commit '305013b1638e72712464f122435ff350aef5a6be':
  DO NOT MERGE Remove extra fragment in captioning preferences


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help