am 612f818e: Merge "Allow ILD information to be populated" into lmp-mr1-dev

* commit '612f818e54a6652982b2d877b57e4024bb6f7b68':
  Allow ILD information to be populated
tree: 364e5efd75c624c829791e6436d15b2677f13cb7
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags