am e7c4833e: (-s ours) am c5366f4d: am b82d5c2b: am 00c8771d: DO NOT MERGE Fix broken copy-paste dialog

* commit 'e7c4833e3474258d13fcf1affeafb3d528dea6cc':
  DO NOT MERGE Fix broken copy-paste dialog
tree: 99e688c7e36f931d36c7f93c9fcb68fcc79fa803
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags