OSDN Git Service

am 082f833d: (-s ours) Merge "Fix ADT build. Do not merge." into tools_r14
authorRaphael <raphael@google.com>
Sat, 24 Sep 2011 19:25:44 +0000 (12:25 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 24 Sep 2011 19:25:44 +0000 (12:25 -0700)
commitdb415d32176242b3298a65d2769fff8d4e0dc92f
tree5bb4c9b726a0f9aff6b72161adc8773a8063f148
parent316df2466dcc97db8104925ac059a9ac93359d79
parent082f833d2eed8e6cb6e4e75a273f76b796902133
am 082f833d: (-s ours) Merge "Fix ADT build. Do not merge." into tools_r14

* commit '082f833d2eed8e6cb6e4e75a273f76b796902133':
  Fix ADT build. Do not merge.