OSDN Git Service

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)
commitbd6c665cc32a9d1cfe57015be55199217790b3ac
tree5bb4c9b726a0f9aff6b72161adc8773a8063f148
parent06c06646b5a40e6939ba31cbfd5067238d2d45fc
parent39da114da748ccf6c03e6766e0a8245333b49422
am 39da114d: (-s ours) Merge "SDK: Fix traceview build. Do not merge." into tools_r14

* commit '39da114da748ccf6c03e6766e0a8245333b49422':
  SDK: Fix traceview build. Do not merge.