tree 2490927b166c218c58cf3fd655e274d9a403b948
parent 6967c8458cc9b7351bae0559573ed66e897f864a
parent 54c543d487a49f477756e7afeaafd68238229c50
author Evan Charlton <evanc@google.com> 1415666037 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415666037 +0000

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

* commit '54c543d487a49f477756e7afeaafd68238229c50':
  Allow ILD information to be populated