| commit | 67f36a8e6130f5c22ab177b0d29f5705e86daca2 | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Mon Sep 14 14:56:20 2015 +0900 |
| committer | Robert Shih <robertshih@google.com> | Mon Sep 14 11:02:49 2015 -0700 |
| tree | 0c22425637efc13275435df057e6bfa2c0beb48b | |
| parent | d021f7e5686074771981a6386b59e803160a1073 [diff] | |
| parent | 76b704e3872a7e17362c398e7b898b0d635e0f2d [diff] |
resolved conflicts for 76b704e3 to lmp-mr1-dev Change-Id: I843f6b4080b06581c52683ab4af5261e974cd7af