| commit | 8644b3d89213adda36e118426e2aae7d059a32bb | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 18:13:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 18:13:18 2015 +0000 |
| tree | 0c08cc8d4bfcdd7cd832aed7ef6cc559ada86a5a | |
| parent | 8d5bd4c0d57bd3067d5ce0defd7efd7ae5698287 [diff] | |
| parent | 550ba39695b42106d4b9272ceb066d7fcf16f9ae [diff] |
am 550ba396: am 4c53fed0: am f24c7e3a: (-s ours) Merge "DO NOT MERGE: adding 1 more knownfailure" into kitkat-cts-dev automerge: aace927 -s ours * commit '550ba39695b42106d4b9272ceb066d7fcf16f9ae':