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

* commit 'ed9cc555ee69feb0a1b13caf29ffefa56cf51149':
This commit is contained in:
Jean-Baptiste Queru
2013-02-27 06:26:33 +00:00
committed by Android Git Automerger

Diff Content Not Available