commit | d9aea039e80363c2256e83fe86d155803dc908f9 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:17:52 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:17:52 2015 +0000 |
tree | 9bd13ffbdf4a9782443ecb85251887f5af7dc826 | |
parent | 88fbc742958684f171e79159b40edfee07127916 [diff] | |
parent | 3097d0e151b4f07552e987ee5819e9e7c6953a71 [diff] |
am 3097d0e1: (-s ours) am 6d24e086: Merge "Remove dead code." * commit '3097d0e151b4f07552e987ee5819e9e7c6953a71':