| commit | 6fdf8966c7afcb5c7bf04788952933aa606a7b2b | [log] [tgz] |
|---|---|---|
| author | Craig Donner <cdonner@google.com> | Tue Jun 14 03:55:26 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 14 03:55:27 2016 +0000 |
| tree | a47ebec6266473ad67f5bb17437d4d8e51c3dc36 | |
| parent | 66e84e18c00bab4ab938b56a5e069926f5604160 [diff] | |
| parent | 30b71b10302bdfcd6c0679c03cf21d17a715317b [diff] |
Merge "resolve merge conflicts of 4931fb2 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp