am 96df62ef: am 4168dc49: am 97436804: am 540efef7: Merge changes Ida9603e3,I3dfa45cc into jb-ub-now-jolly-elf

* commit '96df62ef12af2b0bddbe7b18c6b40e187d2ad539':
This commit is contained in:
Winson Chung authored and Android Git Automerger committed 2014-10-23 17:31:27 +00:00
commit 7ed74d2cc2

Diff Content Not Available