am 095a6a6e: am 739cd9d2: Merge "get rid of compile time warning: "warning: ‘android_ids’ defined but not used"" into gingerbread

Merge commit '095a6a6ecb8039067c077db381bd02abc2496422'

* commit '095a6a6ecb8039067c077db381bd02abc2496422':
  get rid of compile time warning: "warning: ‘android_ids’ defined but not used"