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 - do not merge

* commit '18fe7d501b924bd1fcb86939594e5d5034881d43':
This commit is contained in:
The Android Open Source Project 2013-10-09 23:13:22 -07:00 committed by Android Git Automerger
commit 5c55f94b19

Diff content is not available