| commit | 094f08efa1fb3aac18034c3cef7b7697f1125761 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Tue Nov 03 21:51:07 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 03 21:51:07 2015 +0000 |
| tree | c1061889a3dc3f936a729edbe7d36654fecbbb22 | |
| parent | ad0edadeabd6153b3228bf0b064fd847f6d3698d [diff] | |
| parent | 24937d235da1648ece1866ce326da539c0ccb4bf [diff] |
Merge "resolve merge conflicts of 3aee38c86e to master."