am 626d6e47: (-s ours) am 378164a5: (-s ours) am 8b26ab26: (-s ours) am ea88e2ff: (-s ours) am 150da225: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '626d6e47ddeeda1bb81de651b6bdf77531100ed9':
main
The Android Open Source Project 2013-10-03 11:36:47 -07:00 committed by Android Git Automerger
commit 8c910aa1e5

Diff Content Not Available