OSDN Git Service

(root) / android-x86 / hardware-libhardware_legacy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61f3579 17f1ff8)
am 17f1ff8c: (-s ours) do not merge bug 3370834 Cherrypick from master CL 79894
authorJean-Michel Trivi <jmtrivi@google.com>
Sat, 29 Jan 2011 17:54:43 +0000 (09:54 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 29 Jan 2011 17:54:43 +0000 (09:54 -0800)
* commit '17f1ff8c99dada2cca93f68d434cf64a6dc692c2':
  do not merge bug 3370834 Cherrypick from master CL 79894


Trivial merge
hardware/libhardware_legacy
About OSDN
Find Software
Develop Software
Help