| commit | d2f88da89dcff6677ab0d6b98e393830a9782f4c | [log] [tgz] |
|---|---|---|
| author | Christopher Wiley <wiley@google.com> | Thu Aug 27 05:12:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:12:21 2015 +0000 |
| tree | e56d471de89c24df292add0ec4dec9100686fc07 | |
| parent | cefc1c229529b6969f5add43040c99ee5b80223c [diff] | |
| parent | 25c19e6fd44af4164148a4f1b5831b24af05a025 [diff] |
am 25c19e6f: (-s ours) resolved conflicts for merge of 62789539 to mnc-dev-plus-aosp * commit '25c19e6fd44af4164148a4f1b5831b24af05a025':