tree 18b6e8723e47300dc498d859646ff2be9ef41d06
parent 989239963eac90b17caa1bc737cc0764a62049c5
parent 0640d1551eeaba4cdff68633ebcf6c789d6541b8
author David Turner <digit@android.com> 1400670699 +0000
committer android-build-merger <android-build-merger@google.com> 1400670699 +0000

Merge "Read config.ini for Android build too" into idea133
 Auto-merge: 0640d15

* commit '0640d1551eeaba4cdff68633ebcf6c789d6541b8':
  Read config.ini for Android build too