| commit | eb9790a6542d388106dd5b84786ec4125b50d59d | [log] [tgz] |
|---|---|---|
| author | Matt Sarett <msarett@google.com> | Thu Aug 27 20:38:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:38:22 2015 +0000 |
| tree | f3ae81c140bcc5adf6a0cef138f50b006907d746 | |
| parent | 95e2ff62d197479d3510c255d87c82ab185e2e4b [diff] | |
| parent | 814d1938f091d311c709bc714c2d31032d43d7bc [diff] |
am 814d1938: am b1df2577: (-s ours) resolved conflicts for merge of ab10e256 to mnc-dev-plus-aosp * commit '814d1938f091d311c709bc714c2d31032d43d7bc':