| commit | 7ed74d2cc2deb59e32d72a0950e7beb179d73d46 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Thu Oct 23 17:31:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:31:27 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | 22808603a92a75356d4419036644ff745b66afd2 [diff] | |
| parent | 96df62ef12af2b0bddbe7b18c6b40e187d2ad539 [diff] |
am 96df62ef: am 4168dc49: am 97436804: am 540efef7: Merge changes Ida9603e3,I3dfa45cc into jb-ub-now-jolly-elf * commit '96df62ef12af2b0bddbe7b18c6b40e187d2ad539':