删除提交
。。。。
2.X 更新
xiugai
i .....
...
i tijiaole tanchukuangxianshizongjine zhaoling
i lllllll
i .....
i ------
i .....
i ......
解决合并
Merge branch '2.1'

Conflicts:
	src/com/android/component/ui/main/OrderComponent.java