Merge "Reset restricted count on merge."
tree: b5056c5f978cbc13d23352f8edfe8860204ff452
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. LICENSE