projects / sdk / emulator / emulator-manager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a8611b 46fccac)
Merge branch 'develop' into release
authorjihye kim <jihye1128.kim@samsung.com>
Fri, 7 Sep 2012 06:12:40 +0000 (15:12 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Fri, 7 Sep 2012 06:12:40 +0000 (15:12 +0900)
Conflicts:
package/pkginfo.manifest


Trivial merge
Domain: SDK / Emulator;