am 39e82fb5: am c9e08527: (-s ours) am 87fa6995: (-s ours) am f8ce1ffa: (-s ours) am eb724ddb: (-s ours) am 7f78bd5e: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '39e82fb5fe9817540c874f6902483e2d996f7335':
main
The Android Open Source Project 2013-10-03 14:50:03 -07:00 committed by Android Git Automerger
commit 6a1e1b4ccd

Diff Content Not Available