commit | c5a96cff51ad9948b4fa392fdbbbdce02c9c037e | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Tue Sep 15 00:51:15 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 00:51:15 2015 +0000 |
tree | 6770798b4a4f67f62a5450ac91c94dc8f51a197a | |
parent | 141d6fed07ed5fc07977aba1cd2eda8358058e27 [diff] | |
parent | 3a8c0d1e1d3f2d434be47f525d60d83320f8b6c9 [diff] |
am 3a8c0d1e: (-s ours) am cd8cc93f: (-s ours) am d59d0d7a: (-s ours) am aad953fa: (-s ours) am 92cec147: (-s ours) am 8a012b3a: (-s ours) Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev * commit '3a8c0d1e1d3f2d434be47f525d60d83320f8b6c9':