| commit | 414f8fbdbb66bb88ab181437a7cf9c8938e2c1bf | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jan 06 10:40:33 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 06 10:40:36 2017 +0000 |
| tree | c499c45bf6238324e149ae74973949fdbbdca21d | |
| parent | 1c0070aa5d006abf9a385eec0f6cac45d6196a6c [diff] | |
| parent | 5549258eea588b82fe8c0690062d2c543f7bf3a1 [diff] |
Merge "resolve merge conflicts of 2fda2ce15958 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp