diff options
| author | Tyler Gunn <tgunn@google.com> | 2014-05-13 23:40:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 23:40:44 +0000 |
| commit | c836f76cd86d0e11410d9a5c2710a305847d6cd3 (patch) | |
| tree | b3f23e3bd668d2fb371caf3e6aac25395707d138 | |
| parent | 24b077b5ecfe5ffcdaee7f2522ffb68a12560982 (diff) | |
| parent | 7921cfa7d96695bbcdf19e48e5a308b3abe2b285 (diff) | |
am 7921cfa7: (-s ours) Merge "resolved conflicts for merge of 28ded60d to master-nova" into master-nova
* commit '7921cfa7d96695bbcdf19e48e5a308b3abe2b285':
0 files changed, 0 insertions, 0 deletions