Merge "DO NOT MERGE Add ability to add interop entries dynamically (2/2)" into mnc-dr-dev
tree: 8b135239be1c77289a042d5ac882ba6244620789
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE