| commit | 7e84d75c830b0ddaa499293723e427bca510dbaa | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Tue Jul 14 06:16:08 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jul 14 06:16:09 2015 +0000 |
| tree | d1f74c200b28796394ff96608d4ae29bc89fbe18 | |
| parent | a6b1e102127d1b0b893570976c50e5e0914fc9ca [diff] | |
| parent | e7a084f52d48524c6a54c112a13a6d4611d74610 [diff] |
Merge "resolve merge conflicts of 930a3b5 to kitkat-cts-dev" into kitkat-cts-dev