tree cba62d0d64153aa2169651696bc238591341d679
parent 22808603a92a75356d4419036644ff745b66afd2
parent 96df62ef12af2b0bddbe7b18c6b40e187d2ad539
author Winson Chung <winsonc@google.com> 1414085487 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085487 +0000

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

* commit '96df62ef12af2b0bddbe7b18c6b40e187d2ad539':