am 40946aa2: am 1f668fff: Merge change Idb13ed9a into eclair

Merge commit '40946aa20183984fd60f2dbdc7708cf1c5431047' into eclair-mr2-plus-aosp

* commit '40946aa20183984fd60f2dbdc7708cf1c5431047':
  Add SDK version for MR1.