am b6d1d717: am cf6fc5ee: Merge "Fix incorrect javadoc for Uri.getQueryParameter."

* commit 'b6d1d7171dff2d2625ae183e8629d627882fb493':
  Fix incorrect javadoc for Uri.getQueryParameter.
tree: 42d2935946ef8bbfc064797ae32f6ad545038348
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py