| commit | 2d72d000939acc10ba0f5000689ad86483b7c19e | [log] [tgz] |
|---|---|---|
| author | Gabriel Peal <gpeal@google.com> | Tue Mar 25 18:32:22 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 25 18:32:23 2014 +0000 |
| tree | 232f9ef2209de2a247356595eda35a7cf155b369 | |
| parent | c21929c710949a48790fa2701c47cedfabb7b9dc [diff] | |
| parent | f1e1e7714375b3b83f2cc3956b112293face56a1 [diff] |
Merge "resolved conflicts for merge of 74fb97de to master"