| commit | c4698fbe3a5a94de639f91b01c2cb02b61d51331 | [log] [tgz] |
|---|---|---|
| author | Jay Shrauner <shrauner@google.com> | Thu Apr 30 12:08:52 2015 -0700 |
| committer | Jay Shrauner <shrauner@google.com> | Thu Apr 30 12:10:06 2015 -0700 |
| tree | 35a0819514ffc2d97ad535c5829d22d5c9bcf612 | |
| parent | ac48ce4de74370237e8d6e862cf5e3b26aa8f763 [diff] | |
| parent | 5f35f34f019bba6ff705521b28affbfdb75abd7b [diff] |
resolved conflicts for merge of 5f35f34f to mnc-dev-plus-aosp Change-Id: I817a2ca1a3111fc1b06375e06294f27bddf75cd6