OSDN Git Service

(root) / android-x86 / sdk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06c0664 39da114)
am 39da114d: (-s ours) Merge "SDK: Fix traceview build. Do not merge." into tools_r14
authorRaphael <raphael@google.com>
Sat, 24 Sep 2011 19:24:38 +0000 (12:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 24 Sep 2011 19:24:38 +0000 (12:24 -0700)
* commit '39da114da748ccf6c03e6766e0a8245333b49422':
  SDK: Fix traceview build. Do not merge.


Trivial merge
sdk
About OSDN
Find Software
Develop Software
Help