| commit | 9b3e882c1d110098b3a00e90fb08d42d887c9bab | [log] [tgz] |
|---|---|---|
| author | Greg Plesur <plesur@google.com> | Fri Nov 04 19:04:36 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Nov 04 19:04:39 2016 +0000 |
| tree | 5548ad24b4d1eca3678a6eb3844ac15f966be029 | |
| parent | c76e6b79b30524bab458770cab3761f1901e0cec [diff] | |
| parent | d1ceaff82c8ca6a690d19a87d1a39ecdc1881bb8 [diff] |
Merge "resolve merge conflicts of c874e60 to master"