Merge heads

2013-08-15 09:46:14 +08:00
parent 4d8c44782e
commit d64b6a4d93
30 changed files with 785 additions and 189 deletions
@@ -107,6 +107,9 @@ limitations under the License.
  <uses-feature
    android:name="android.hardware.bluetooth"
    android:required="false" />
+  <uses-feature
+    android:name="android.hardware.camera"
+    android:required="false" />
  <uses-feature
    android:name="android.hardware.faketouch"
    android:required="false" />