| commit | d5a714963cbecf25808cfefa09b3d3552e2b333a | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Jun 25 13:01:28 2015 +0100 |
| committer | Andreas Gampe <agampe@google.com> | Thu Jun 25 20:43:52 2015 -0700 |
| tree | 6296839a9b2e0fa887943eb19f12aee9646b1385 | |
| parent | af7a6eb0ebb3d131b4a2372eeb9516f5ac10869c [diff] |
Fix bogus merge conflict resolution. Fixes build on mnc-dev (cherry picked from commit 5ff6bbf365890f07b4e3906d7b6ef10670dfb5df) Change-Id: I448c6a4d141069472e8605ff0ffbf79c3281491f