projects / sdk / emulator / emulator-manager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc01c80 89cac99)
Merge branch 'release' into develop
authorjihye kim <jihye1128.kim@samsung.com>
Fri, 17 Aug 2012 11:14:25 +0000 (20:14 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Fri, 17 Aug 2012 11:14:25 +0000 (20:14 +0900)
Conflicts:
package/pkginfo.manifest


Trivial merge
Domain: SDK / Emulator;