commit | 8e772d9b778bbce51f4f038570afa49ea802089f | [log] [tgz] |
---|---|---|
author | Nicolas Geoffray <ngeoffray@google.com> | Mon Mar 30 15:02:43 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 30 15:02:43 2015 +0000 |
tree | cc60040e10610964e5d69b4b4f4be9e3823a157e | |
parent | 5f949173ff00663b4e348d34b928d2a98aa4cf10 [diff] | |
parent | 11b9c1b8cd3064f937194088b7a8e1274ce529f1 [diff] |
am 11b9c1b8: am acb4ea0a: Merge "Implement a proper solution for temps." * commit '11b9c1b8cd3064f937194088b7a8e1274ce529f1': Implement a proper solution for temps.