| commit | 6c78c8e8e8d704b6ba5832c7361e207657346a14 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Jun 03 06:11:33 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Jun 03 06:11:33 2015 +0000 |
| tree | 3089511c145de3e39cc97136e66cd87831433c50 | |
| parent | 97fa3a23cc92cab1de23efb80f5253fa8106dc8c [diff] | |
| parent | 76053e708285447c1aff37e42a3df405805d457d [diff] |
Merge "resolve merge conflicts of 6176421 to lollipop-cts-dev." into lollipop-cts-dev