Fix capability missing when merge happen
authorjwang <jing.j.wang@intel.com>
Sun, 9 Jun 2013 07:55:10 +0000 (15:55 +0800)
committerjwang <jing.j.wang@intel.com>
Sun, 9 Jun 2013 08:12:30 +0000 (16:12 +0800)
commita678cae002ce24ece24e044dd8e1ae44529e75df
tree25e15c1fbda0dd9f78554ac13656235afe84520c
parenta65c4ae0b8626503cd0de22da3911455dfc093e4
Fix capability missing when merge happen

Change-Id: I80181cef224fe803e4a6d375d785d4749799793b
js/main.js
tests.xml