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

* commit '8f0cfc76d1ce958b1d8f383d9c645f117c2c9a5a':
  Set correct targetSdkVersion for DevelopmentSettings