am 1512e8a6: am f8313c34: am 669c3823: am 4aed7b07: Reconcile with jb-mr1-release - do not merge

* commit '1512e8a6c661189b56572e0ffd5287045e20383c':
This commit is contained in:
Jean-Baptiste Queru
2013-02-26 22:10:32 +00:00
committed by Android Git Automerger

Diff Content Not Available