| commit | b26249b76ab3a449b479eebfc28032775b74e5fd | [log] [tgz] |
|---|---|---|
| author | Wonsik Kim <wonsik@google.com> | Tue Sep 15 07:34:45 2015 +0900 |
| committer | Wonsik Kim <wonsik@google.com> | Tue Sep 15 07:34:45 2015 +0900 |
| tree | b96577b2d579f3703ec1f9c04126d0f5fc4f6ef9 | |
| parent | 4374b187e5e72056f8e814dae752b62cb60fc9a4 [diff] | |
| parent | 421977ae5117403dd481424fab48850d31f239e8 [diff] |
resolved conflicts for 421977ae to mnc-dev Change-Id: I0d195dece9abf50cafc9b6393c68b72d99b2482a