Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:17:40 +0000 (09:17 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:17:40 +0000 (09:17 -0700)
commit4ed896ce6a2e53de38d6d00fbe8750e48b2925ff
tree69b50c591a2260216f0f4c4efebc07edfb247f32
parent0ad5fc615d65b3730af0f5324ab77608bdec0c15
parent32d8a9b71910daa5e56da13f7fc5c5e88f6f6559
Reconcile with jb-mr1-release - do not merge

Change-Id: I655ef2dc4e9a7bd82b72287f41ba69a8009720ae