| commit | 28b8434a007290fca6ea6a9f8daed779c2f8fb93 | [log] [tgz] |
|---|---|---|
| author | Chad Jones <chadj@google.com> | Fri Jun 13 00:46:55 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 11 08:41:11 2014 +0000 |
| tree | a6e338dee8ce739ee289e1f72d347d6d2c5d2366 | |
| parent | b1768e398fffe8ec9bbadceebae88eb9d5afe343 [diff] | |
| parent | f391ebccea9090fac64201d284641be3882f857a [diff] |
Merge "resolved conflicts for merge of 4849aa86 to master"