| commit | b01b816778eb8202a050c24bafc02d79696e9e56 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 15 17:00:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 17:00:10 2015 +0000 |
| tree | a649443dd4a9a549b40da0cd32f89fda200d08cd | |
| parent | 95d7fb57fd9506098ea6e1ee52a6a1ff6e281002 [diff] | |
| parent | 6c78c8e8e8d704b6ba5832c7361e207657346a14 [diff] |
am 6c78c8e8: Merge "resolve merge conflicts of 6176421 to lollipop-cts-dev." into lollipop-cts-dev * commit '6c78c8e8e8d704b6ba5832c7361e207657346a14':