tree 6fb727ccda1a7478567c1be879721b2c5addab07
parent b6c75a5e1a9dfc7753a451e97607510d37264374
parent aa4543e73bece31146c9d8f7f0b573f3ffe154c8
parent 3f0216eba29e75cdad2091ddb23b92335e9e68b9
author The Android Open Source Project <initial-contribution@android.com> 1352233140 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352233140 -0800

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Iff4148b0409ebaeb03ffb6998ce9624623c9c180