| commit | f6fecb583f797f94d17b735083b7778a51267f56 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 01 10:06:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 01 10:06:50 2015 +0000 |
| tree | 6770798b4a4f67f62a5450ac91c94dc8f51a197a | |
| parent | 4822b351636758cab5df191f001a0c79971a6343 [diff] | |
| parent | df00063926ecc88f439506cc05594bb392e02a58 [diff] |
am df000639: (-s ours) am 2b6c3536: (-s ours) am 91994f09: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev automerge: 8a012b3 -s ours * commit 'df00063926ecc88f439506cc05594bb392e02a58':