OSDN Git Service

Merge "Fix @code escapes"
authorNeil Fuller <nfuller@google.com>
Fri, 15 Jan 2016 16:31:40 +0000 (16:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Jan 2016 16:31:40 +0000 (16:31 +0000)
commit69c2907c6300b976152eb360bc7212e9fdec3f23
tree5c68e104f943bebce0253f345ed7b6e988562e14
parent79ebcde07b80dd735e1122a8d219da4112954a75
parentb0d92f4717af4e4736dc80b2a822dae8e5a52587
Merge "Fix @code escapes"
am: b0d92f4717

* commit 'b0d92f4717af4e4736dc80b2a822dae8e5a52587':
  Fix @code escapes
core/java/android/hardware/Camera.java
core/res/AndroidManifest.xml
docs/html/guide/topics/manifest/uses-feature-element.jd