| commit | 966d2357c552e04ef5c6058d36b55b9122c601ea | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Dec 13 20:38:52 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Dec 13 20:38:55 2016 +0000 |
| tree | 60403879eefa2b45c67ea6646b7384ddb7536727 | |
| parent | 0cc0222bdf7e7b6da3c0885fb87dc718edd3efb6 [diff] | |
| parent | 4460839e5ce43777e7f32841e4ab2e2ce0008257 [diff] |
Merge "Finish resolving conflict from d23dc17" into nyc-mr2-dev-plus-aosp