am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'e5412a9a9597433ae2540b390269c514c46402f1':
This commit is contained in:
Jean-Baptiste Queru
2013-03-11 12:19:03 -07:00
committed by Android Git Automerger

Diff Content Not Available