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 '24616efffb9d986ca87ece44bd7f25c0c6b174ce':
This commit is contained in:
The Android Open Source Project 2013-10-03 11:33:01 -07:00 committed by Android Git Automerger
commit 6093b8ef6f

Diff content is not available