am d1689ea8: am 8e1985d4: Merge change Ie552036f into eclair

Merge commit 'd1689ea8b7ec4b36865072aa23a6622d3c5a9513' into eclair-mr2-plus-aosp

* commit 'd1689ea8b7ec4b36865072aa23a6622d3c5a9513':
  Fix issue #2286419: maxSdkVersion causes existing apps to disappear.