am bd65e610: am 60aa327d: am 68b247d8: (-s ours) am d1938819: (-s ours) am d55e661e: am 3392102c: (-s ours) am 98691110: (-s ours) am 61adf619: (-s ours) am ea3027fe: (-s ours) am 0532b398: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'bd65e6107f37f9b462d8a24dca4699f2c2252e1f':
main
The Android Open Source Project 2013-10-09 19:58:31 -07:00 committed by Android Git Automerger
commit 18fe7d501b

Diff Content Not Available