| commit | b30f841cb44e132598939b0797dad41f6c0004a7 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Wed Jul 22 12:00:50 2015 -0700 |
| committer | Adrian Roos <roosa@google.com> | Wed Jul 22 12:00:56 2015 -0700 |
| tree | 764ce0e064d7d786ab93072493299999bc307386 | |
| parent | c41e3191654d1b1e9df641da6aa7a8bf4f64b975 [diff] | |
| parent | c1244a2995087c930842b7d5e5a35a446c5c40f7 [diff] |
resolved conflicts for merge of c1244a29 to mnc-dr-dev Change-Id: I8b3e3a21e36ac5085bf1dffa90e49dabd17dd139