OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f71efd 8fa3ba4)
am 8046e294: Merge "DO NOT MERGE" into ics-scoop
authorRamanan Rajeswaran <ramanan@google.com>
Mon, 13 Feb 2012 22:24:38 +0000 (14:24 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Feb 2012 22:24:38 +0000 (14:24 -0800)
* commit '8046e294c545b8e3712bff7925b024639936d5bf':
  DO NOT MERGE

1  2 
include/utils/ResourceTypes.h patch | diff1 | diff2 | blob | history

diff --cc include/utils/ResourceTypes.h
Simple merge
frameworks/native
About OSDN
Find Software
Develop Software
Help