Merge "Completely remove log_energy_info from tests" into nyc-mr1-dev
tree: 42517959981a416cfbfd37efb77ef0cfd4bf9e81
  1. acts/
  2. Android.mk