tree 10da860fcff71886af91d082e31f0e1917926848
parent b693886f81648c5fa77555f8facc35fc6ccd9303
parent 7ed74d2cc2deb59e32d72a0950e7beb179d73d46
author Winson Chung <winsonc@google.com> 1414566367 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566367 +0000

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

* commit '7ed74d2cc2deb59e32d72a0950e7beb179d73d46':