| commit | 92d091da4bcf670fd36d7161f1c396d30c25046e | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Mon Aug 15 22:27:29 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 15 22:27:30 2016 +0000 |
| tree | e10a2abb7ff9a71af8e64847cd29f1d0f79cfbfa | |
| parent | 2d280471669568d9e14cb7df679a51cf7f4d6c11 [diff] | |
| parent | 4d263be0cf90fac64d7a858b876f574533b4e7d5 [diff] |
Merge "resolve merge conflicts of 28117e0 to master"