| commit | 7e7341f662e7cd25054b11a858a8e1137000b4e0 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Mon May 18 19:58:08 2015 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Mon May 18 19:58:08 2015 -0700 |
| tree | 3ac1db227e2e1076fc862e9fdb5f01ad55d02cd2 | |
| parent | e4ed2db2f5b8df29cc7fbfadcaa3ba786346668d [diff] | |
| parent | c434f71bd887fe4ea3d0f987d26410b7a61c83a2 [diff] |
resolved conflicts for merge of c434f71b to mnc-dev-plus-aosp Change-Id: I32ebfab7391089d399a00a7b8b63cdc21e46a0ea