| commit | a519938250d3c50ddf36d872571304631e61a7ed | [log] [tgz] |
|---|---|---|
| author | Fan Zhang <zhfan@google.com> | Fri Jul 15 23:06:24 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 15 23:06:25 2016 +0000 |
| tree | 1dc4a0848ce5783c56df528c382044f500fb95b6 | |
| parent | ea70d8d0d0de13379a7ea9d9b7148bfac3e75942 [diff] | |
| parent | f04fe0489f7e6e16ef628559739f63b5d25674e6 [diff] |
Merge "resolve merge conflicts of b9d34b3 to master"