| commit | 979e3421c8111a56ebfcf176f6383df58eed52ea | [log] [tgz] |
|---|---|---|
| author | Andre Eisenbach <eisenbach@google.com> | Wed Jun 10 21:04:38 2015 -0700 |
| committer | Andre Eisenbach <eisenbach@google.com> | Wed Jun 10 21:07:19 2015 -0700 |
| tree | 115b636fdcf8c8420f5eed07681d2963680cf4e4 | |
| parent | 6fc4832730341b0ba944e5de72ffe5171089f8b7 [diff] |
Fix mnc-dev <-> master merge errors Change-Id: If4d56229de7d47289560a12205feb7e33ac6fcf5