| commit | 0cb25d527f4ca81910feb106cca7ca156a34018b | [log] [tgz] |
|---|---|---|
| author | Cheryl Potter <cherylpotter@google.com> | Wed May 04 19:39:07 2016 -0700 |
| committer | Cheryl Potter <cherylpotter@google.com> | Wed May 04 19:46:50 2016 -0700 |
| tree | 2da219b9af917fbe0d92df06f8f4f0f929ddcf07 | |
| parent | 084d99bfd4938689e6394a8f3bcb5d261b852f93 [diff] | |
| parent | c522dc65c419145119217bfa6bfae127afe0829d [diff] |
resolve merge conflicts of c522dc6 to mnc-mr-docs Change-Id: Ib4aedad4813a7973268239957b5103642941733d