tree de1d52b12fa373ee02adcf60dd7ca51356f2820d
parent 0afab17655d8733b0a3b180b52f91c65518e77ab
parent 18cb0198efe5fa245765becfd310f801ab7faa39
author Doug Zongker <dougz@google.com> 1345234794 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345234794 -0700

am 18cb0198: am 6937a447: Merge "load SYSTEM/build.prop into the info_dict" into jb-mr1-dev

* commit '18cb0198efe5fa245765becfd310f801ab7faa39':
  load SYSTEM/build.prop into the info_dict