| commit | 2adbbabfc8e5019cb1ac16b2610881589b8bf090 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Thu Jun 25 19:47:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 25 19:47:34 2015 +0000 |
| tree | a28616b797c83013738d84d68108b6976466d44b | |
| parent | d703f54c914b11636001251b3ff9bf1dd0937163 [diff] | |
| parent | 9c3d03e63ae15b1371138c62df47a530cb002140 [diff] |
am 9c3d03e6: Merge "resolve merge conflicts of f9ffa90 to lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev * commit '9c3d03e63ae15b1371138c62df47a530cb002140': Removing launcher tests from knownfailures