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

* commit '65db640c4629a68aba24d3b0932da0bdbbdf600a':
  Set correct targetSdkVersion for DevelopmentSettings