| commit | a053597a7176284247b45ca81328e934c98993cd | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Aug 27 11:17:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:17:41 2015 +0000 |
| tree | 8c7d43f9068b85b8c8167d2923f4602fcccc33f7 | |
| parent | 9ee3ba3bd76391e71d6910ef4156aa378d0dd956 [diff] | |
| parent | 438e2585b21aff9f418c0f8916ae93dd2ac13498 [diff] |
am 438e2585: (-s ours) resolved conflicts for merge of beb0cff6 to mnc-dev-plus-aosp * commit '438e2585b21aff9f418c0f8916ae93dd2ac13498':