am 8b26ab26: (-s ours) am ea88e2ff: (-s ours) am 150da225: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '8b26ab265348f0591190fa35000fae2a4289118d':
This commit is contained in:
The Android Open Source Project 2013-09-26 03:22:13 -07:00 committed by Android Git Automerger
commit 378164a5f5

Diff content is not available