| commit | 8649ccda290c6917a1f52e14e147f9245cb6f792 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Oct 25 00:10:00 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Oct 25 00:10:00 2016 +0000 |
| tree | 63d3152ba935baedd0c065cc674874462d18f7cf | |
| parent | fd26f1793d8aa059bf407a3c8426dea9309ec542 [diff] | |
| parent | 1094f099044253c57069bfb09c86c7f51499f0ae [diff] |
Merge "resolve merge conflicts of 7c5aeb0 to nyc-mr2-dev-plus-aosp" into nyc-mr2-dev-plus-aosp