tree ecb7dbbe9a371b3612a0497813b71f40f1f1346b
parent 568555c54eaa083081cb14886912bd762a75cae5
parent 1429643f009108a16b91b313927d8aa08d17e9e7
author Neil Fuller <nfuller@google.com> 1433353377 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433353377 +0000

am 1429643f: am 97313955: Merge "Modification to the way boot classpath resources are loaded"

* commit '1429643f009108a16b91b313927d8aa08d17e9e7':
  Modification to the way boot classpath resources are loaded