| commit | 5f6ed7e2fa8ec00f6ecff045d5992a18559006a0 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 00:41:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 00:41:03 2015 +0000 |
| tree | fbe9d58145fbd241af0df0bb1bbed417cf31e3f2 | |
| parent | f94cafa620f1d1f00a27baacb342d57be7b38ccd [diff] | |
| parent | 476f1d7e1f879701ea2db2e17ef5a52bb55af9b7 [diff] |
am 476f1d7e: am eda58024: am 254071be: (-s ours) DO NOT MERGE: resolved conflicts for c2f0e5e1 to klp-modular-dev * commit '476f1d7e1f879701ea2db2e17ef5a52bb55af9b7':