| commit | 5ff6bbf365890f07b4e3906d7b6ef10670dfb5df | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Jun 25 13:01:28 2015 +0100 |
| committer | Narayan Kamath <narayan@google.com> | Thu Jun 25 12:02:56 2015 +0000 |
| tree | 301c7623cb0c5fe71bceee505ff0a2ec82aa8be6 | |
| parent | 1bd05ae09cc0fdb962c5df1161076f08054011b4 [diff] |
Fix bogus merge conflict resolution. Fixes build on mnc-dev Change-Id: I448c6a4d141069472e8605ff0ffbf79c3281491f