OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f16f61 b4e62fd)
am 796f1af0: Merge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp...
authorScott Main <smain@google.com>
Thu, 27 Jan 2011 03:13:54 +0000 (19:13 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Jan 2011 03:13:54 +0000 (19:13 -0800)
* commit '796f1af04567dab098f638c9166caebc2818efe4':
  enable preview mode for docs and add api level 10 flag for api level diffs


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help