| commit | 0baead15fe8e9eda268d7853e9990850445c40a6 | [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 | a4fa8778407a243c7cd8f87b0297d63d6a9554e7 [diff] | |
| parent | e204690ae7521726711b3b16f29c5e52a980ebb3 [diff] |
Merge "resolve merge conflicts of 7c5aeb0 to nyc-mr2-dev-plus-aosp" into nyc-mr2-dev-plus-aosp