| commit | e685ccd8a852e197cd24b974c35eff86c1ff9a38 | [log] [tgz] |
|---|---|---|
| author | Miao Wang <miaowang@google.com> | Thu Aug 27 10:45:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:45:08 2015 +0000 |
| tree | 8aa0fca8a31de7cb0b09ca6810d20534fc44659b | |
| parent | 99397cddb1cbcb22bd0dc8a88328ed9d4fd121f6 [diff] | |
| parent | 17180e9fcd49c96a2d4c03eca4b6668991219e65 [diff] |
am 17180e9f: (-s ours) resolved conflicts for merge of 9267631b to mnc-dev-plus-aosp * commit '17180e9fcd49c96a2d4c03eca4b6668991219e65':