| commit | d04c6d19a589a2a0f60650675438c59ac6900f45 | [log] [tgz] |
|---|---|---|
| author | Alex Hills <ahills@google.com> | Mon Sep 14 16:37:12 2015 -0400 |
| committer | Alex Hills <ahills@google.com> | Mon Sep 14 17:03:58 2015 -0400 |
| tree | d95bcb8f52894ff373694bee7a40f1846fd5da51 | |
| parent | e8c98b77854d39606960b0b6f5b5332c61e9a3d9 [diff] | |
| parent | 693e11e56f5fc945d7af5d5213c6d844c7b88a5d [diff] |
resolved conflicts for 693e11e5 to mnc-dr-dev-plus-aosp Change-Id: I701841759a80f434a09b086492e817ca23a6a2e6