commit | 38ede6d74bf3b70e86a6eb99307dae79df45976e | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Oct 23 19:33:01 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 19:33:01 2014 +0000 |
tree | cba62d0d64153aa2169651696bc238591341d679 | |
parent | 253e9df603d89af35765629b9e3fe14283295653 [diff] | |
parent | 9bc59c20d0bc0683c537560ea92c581eeaf1ebe9 [diff] |
am 9bc59c20: (-s ours) Merge commit \'457e9215df2a8353f484a268950623d714afa01c\' into klp-dev-plus-aosp * commit '9bc59c20d0bc0683c537560ea92c581eeaf1ebe9':