am 5c55f94b: am 18fe7d50: (-s ours) 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 -

* commit '5c55f94b196c573a1efd6f700a8ea8db0222cf05':
main
The Android Open Source Project 2013-10-10 00:44:22 -07:00 committed by Android Git Automerger
commit f257c3a197

Diff Content Not Available