| commit | 3954d39547c2580e712c0213681b488bf0eb2714 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Fri Aug 21 15:57:56 2015 -0700 |
| committer | Stephen Hines <srhines@google.com> | Fri Aug 21 15:57:56 2015 -0700 |
| tree | a4dd9b15c4df6f92936364327d6d6711ce80f648 | |
| parent | fe0fcf5cad75c6ba717a3d0a4ddb7c6bc656135d [diff] | |
| parent | da1173f4e113f56ce369ebf1686180f1fc51b9d0 [diff] |
resolved conflicts for merge of da1173f4 to mnc-dr-dev-plus-aosp Change-Id: Iaeae433481d4059162fa79f14a38f3cac9fe9db2