am 75dbc398: Merge "Set correct targetSdkVersion for DevelopmentSettings" into jb-mr1-dev

* commit '75dbc3984c2c531427a77ae9e74c655b25785999':
  Set correct targetSdkVersion for DevelopmentSettings