| commit | 3ae0ff679751901c749b92d0b2347fb63a2e32ec | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Aug 07 18:02:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 07 18:02:40 2015 +0000 |
| tree | d927976c76a856c65b964c3729c8e6fc391b5d76 | |
| parent | cff16058eb3c671cbb1fb5641a67746548c72312 [diff] | |
| parent | 3f4ed3012c301de07ef0f511a8e50dc7c1a39f20 [diff] |
am 3f4ed301: (-s ours) am c48f1420: am 96d6e739: am a1538ecf: (-s ours) Merge "DO NOT MERGE: adding 1 more knownfailure" into kitkat-cts-dev automerge: aace927 -s ours automerge: f24c7e3 * commit '3f4ed3012c301de07ef0f511a8e50dc7c1a39f20': DO NOT MERGE: adding 1 more knownfailure