am 5111f8cf: (-s ours) am 36b7da79: am ed60c5f3: am 9edb2a35: (-s ours) am 0503ac42: (-s ours) am 6093b8ef: am 24616eff: (-s ours) am e6098b20: (-s ours) am 265861dc: (-s ours) am 82c852cb: (-s ours) am b528e251: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '5111f8cf20855d5bff0fa16f3b7cded80c4be821':
main
The Android Open Source Project 2013-10-09 23:07:49 -07:00 committed by Android Git Automerger
commit 77bc1bc032

Diff Content Not Available