| commit | a43a0d76a4fc08251c76c9c5cf5f3b9243b624eb | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed May 13 09:10:17 2015 -0700 |
| committer | Kenny Root <kroot@google.com> | Wed May 13 09:10:17 2015 -0700 |
| tree | 35561a6db940ba19f614184c1d21f943a2b4105e | |
| parent | cfc35342441dd0151cc523f178384a6eae6d6c7e [diff] | |
| parent | 91e485fad1fb3dc5d1c5f8fa323c22f2c5d9b960 [diff] |
resolved conflicts for merge of 91e485fa to mnc-dev-plus-aosp Change-Id: Ibb4a2058e585218bdeaf4c1d568093fbbd8f6478