| commit | a3220ef87bc385d69cb5d4c758ce3ce75130145a | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Jun 26 22:57:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 26 22:57:48 2015 +0000 |
| tree | c07007dade7f36cc84295d14e8d3e78595029cbb | |
| parent | 04ca3e5193d24a4ef772faa403c17b32d80dbd12 [diff] | |
| parent | a89c051c4f17b4f542860e159df076ae651e5f10 [diff] |
am a89c051c: am 7447b850: am a2913b32: am a1887d4c: am 2adbbabf: am 9c3d03e6: Merge "resolve merge conflicts of f9ffa90 to lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev * commit 'a89c051c4f17b4f542860e159df076ae651e5f10': Removing launcher tests from knownfailures