am a9be570b: resolved conflicts for merge of fdc3192e to honeycomb-plus-aosp
am a9be570b: resolved conflicts for merge of fdc3192e to honeycomb-plus-aosp

* commit 'a9be570b5d5351bc13da1cbc0a5be3a6ea1113d1':
  Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge.

RR-msm7x30/platform_manifest,ND-3500/platform_manifest,xorware/android_build,xorware/android_build,pranav01/platform_manifest,xorware/android_build,hagar006/platform_manifest,xorware/android_build,see4ri/lolili,fallouttester/platform_manifest,knone1/platform_manifest,Hybrid-Power/startsync,xorware/android_build