Merge "Fix dependencies of packages that target earlier releases" am: 8e49b42b6f
am: ef26655bcf  -s ours

Change-Id: Ie6549560c815fb1ee03ff9ec51f27b30f5087cf9
tree: 5a2b6df3ec5c90c75f8e55aedf9859cf1bfa7022
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE