| commit | a404a421ed2b7fe6bd956c5b929853f80d23a957 | [log] [tgz] |
|---|---|---|
| author | Raymond Chiu <chiur@google.com> | Fri Jul 24 17:53:41 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Jul 24 17:53:41 2015 +0000 |
| tree | 8e9fd7722c1d59ae41241f494649bf9ceee70245 | |
| parent | da76865816465f906eda12afaf69fe13bf75e487 [diff] | |
| parent | ffe19f2e2fc87199911569fb5c9694db12321521 [diff] |
Merge "resolve merge conflicts of 84da716 to studio-1.4-dev." into studio-1.4-dev