| commit | 80eaa6aaaf676e7fa34ad5cd92ff161bb31b5c76 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Wed Apr 01 22:58:01 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 01 22:58:02 2015 +0000 |
| tree | d53033da3c2ad7b66270f70711f67d3c2821764b | |
| parent | d29c29270ab99b0f3935a884310befe920c243fb [diff] | |
| parent | ac038f3b69724647e9ff7b115eea77d442c9d0f5 [diff] |
Merge "resolved conflicts for merge of 844e44c9 to master"