am 76319e9a: (-s ours) am 6a1e1b4c: (-s ours) 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 '76319e9ad122c00f779bfff0e576ed1a130d05cb':
main
The Android Open Source Project 2013-10-03 17:00:39 -07:00 committed by Android Git Automerger
commit f3a4b32022

Diff Content Not Available