| commit | 8ccfe899a7b7edebf776584d0e32139cc990c8d5 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Wed Mar 11 00:19:26 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Mar 11 00:19:27 2015 +0000 |
| tree | c7272eade2055237826538dc2b8597226c61de97 | |
| parent | bd5e03b6d996aa39a6f607a55ffd0691a55b1cee [diff] | |
| parent | 2c1078fbbd550d8adb7ca0d39447bfebc6092012 [diff] |
Merge "resolved conflicts for merge of b6d6c04a to master"