OSDN Git Service

(root) / android-x86 / development.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0ac4b1 0da4f15)
resolved conflicts for merge of 0da4f158 to eclair
authorRaphael <raphael@google.com>
Mon, 16 Nov 2009 21:06:54 +0000 (13:06 -0800)
committerRaphael <raphael@google.com>
Mon, 16 Nov 2009 21:07:43 +0000 (13:07 -0800)
Fixes a merge eclair-sdk => eclair conflict of
  SDK Manager: phase 1 of support for future schemas
  SDK BUG 2252825

Change-Id: I7530bdb7315439416abad114ef59208f8d4b3ab8


Trivial merge
development
About OSDN
Find Software
Develop Software
Help