OSDN Git Service

(root) / android-x86 / system-extras.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 066c268 f69ebab)
resolved conflicts for merge of f69ebaba to jb-mr1-dev-plus-aosp
authorColin Cross <ccross@android.com>
Wed, 19 Dec 2012 00:11:23 +0000 (16:11 -0800)
committerColin Cross <ccross@android.com>
Wed, 19 Dec 2012 00:11:23 +0000 (16:11 -0800)
Change-Id: Ia1c7025ab3d14f2d47e07acf58e161624d94c07c


Trivial merge
system/extras
About OSDN
Find Software
Develop Software
Help