| commit | fe510165f8afa51bbba0b964cbd8772ec466629b | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 20:42:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:42:04 2015 +0000 |
| tree | 0fe003ba0d24a69430cffa048f11766abc81bc61 | |
| parent | 437efca9fe5d3277b72796e03929796fc406e909 [diff] | |
| parent | a2803d950bb43e2dbc05c9aaea4f7ca33a19ce29 [diff] |
am a2803d95: am b7741b8d: am 2f896bf1: (-s ours) am efc9d381: am 8644b3d8: 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 'a2803d950bb43e2dbc05c9aaea4f7ca33a19ce29':