| commit | ea5a4cd0d799a7c31b9a9511fe648ac44b6240aa | [log] [tgz] |
|---|---|---|
| author | Ian Pedowitz <ijpedowitz@google.com> | Thu Aug 27 05:21:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:21:22 2015 +0000 |
| tree | 0c95cfa6c7fd28b15ac08f4d70497562fc384835 | |
| parent | 732a5062457bdeacebbc7d0964ddaaba76d8be68 [diff] | |
| parent | 98841d360524c3049a3b205cb975d937e2619700 [diff] |
am 98841d36: (-s ours) resolved conflicts for merge of bb37e84f to mnc-dev-plus-aosp * commit '98841d360524c3049a3b205cb975d937e2619700':