| commit | 8f8dc4882bc61b7e273ac991e2ae99834d55b7d0 | [log] [tgz] |
|---|---|---|
| author | Ruben Brunk <rubenbrunk@google.com> | Fri Jan 09 17:19:45 2015 -0800 |
| committer | Ruben Brunk <rubenbrunk@google.com> | Fri Jan 09 17:19:45 2015 -0800 |
| tree | 5b14f3a44d44e9ae1461c69234fd198a84cd0966 | |
| parent | f3ac99f2e093f851ca52bcd5aefb251046db10fa [diff] | |
| parent | 0f647c19f970bfb14a48f6b014ea26ce57c224f4 [diff] |
resolve merge conflicts of 0f647c1 to lmp-mr1-dev-plus-aosp. Change-Id: Idbf96ab23c02dc7c380d6c3a4a87b1f380446c61